diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 0b9ab8849f7..f0788e55c99 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -521,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes)
     OPT_DEFS += -save-temps=obj
 endif
 
-# TODO: remove this bodge?
-PROJECT_DEFS := $(OPT_DEFS)
-PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
-PROJECT_CONFIG := $(CONFIG_H)
-
-CONFIG_H += $(POST_CONFIG_H)
-ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
-
 OUTPUTS := $(INTERMEDIATE_OUTPUT)
 $(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC)
-$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \
+$(INTERMEDIATE_OUTPUT)_DEFS := \
 	-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \
 	-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
-	$(PROJECT_DEFS)
-$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC)
-$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG)
+	$(OPT_DEFS)
+$(INTERMEDIATE_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
+$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H)
 
 # Default target.
 all: build check-size
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 49197dc91e1..68f9a1dd08a 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
     POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
-    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
     LIB8TION_ENABLE := yes
diff --git a/keyboards/0xcb/splaytoraid/32u4/rules.mk b/data/constants/keycodes/keycodes_0.0.4.hjson
similarity index 100%
rename from keyboards/0xcb/splaytoraid/32u4/rules.mk
rename to data/constants/keycodes/keycodes_0.0.4.hjson
diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson
new file mode 100644
index 00000000000..d7b27230f30
--- /dev/null
+++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson
@@ -0,0 +1,67 @@
+{
+    "keycodes": {
+        "0x7810": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_ON",
+            "aliases": [
+                "LM_ON"
+            ]
+        },
+        "0x7811": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_OFF",
+            "aliases": [
+                "LM_OFF"
+            ]
+        },
+        "0x7812": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_TOGGLE",
+            "aliases": [
+                "LM_TOGG"
+            ]
+        },
+        "0x7813": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_NEXT",
+            "aliases": [
+                "LM_NEXT"
+            ]
+        },
+        "0x7814": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_PREVIOUS",
+            "aliases": [
+                "LM_PREV"
+            ]
+        },
+        "0x7815": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_UP",
+            "aliases": [
+                "LM_BRIU"
+            ]
+        },
+        "0x7816": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN",
+            "aliases": [
+                "LM_BRID"
+            ]
+        },
+        "0x7817": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_UP",
+            "aliases": [
+                "LM_SPDU"
+            ]
+        },
+        "0x7818": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_DOWN",
+            "aliases": [
+                "LM_SPDD"
+            ]
+        }
+    }
+}
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 3a3a9dbf844..83357ab14e8 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -217,16 +217,17 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{
 
 ## Keycodes :id=keycodes
 
-All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md).
-
-| Key                     | Aliases   | Description                   |
-|-------------------------|-----------|-------------------------------|
-| `QK_BACKLIGHT_TOGGLE`   | `BL_TOGG` | Toggle LED Matrix on or off   |
-| `QK_BACKLIGHT_STEP`     | `BL_STEP` | Cycle through modes           |
-| `QK_BACKLIGHT_ON`       | `BL_ON`   | Turn on LED Matrix            |
-| `QK_BACKLIGHT_OFF`      | `BL_OFF`  | Turn off LED Matrix           |
-| `QK_BACKLIGHT_UP`       | `BL_UP`   | Increase the brightness level |
-| `QK_BACKLIGHT_DOWN`     | `BL_DOWN` | Decrease the brightness level |
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
 
 ## LED Matrix Effects :id=led-matrix-effects
 
diff --git a/docs/feature_sequencer.md b/docs/feature_sequencer.md
index 87a277400a2..3af55197c54 100644
--- a/docs/feature_sequencer.md
+++ b/docs/feature_sequencer.md
@@ -44,7 +44,7 @@ While the tempo defines the absolute speed at which the sequencer goes through t
 |-------------------------------|---------|---------------------------------------------------|
 |`QK_SEQUENCER_ON`              |`SQ_ON`  |Start the step sequencer                           |
 |`QK_SEQUENCER_OFF`             |`SQ_OFF` |Stop the step sequencer                            |
-|`QK_SEQUENCER_TOGGLE`          |`SQ_TOG` |Toggle the step sequencer playback                 |
+|`QK_SEQUENCER_TOGGLE`          |`SQ_TOGG`|Toggle the step sequencer playback                 |
 |`QK_SEQUENCER_STEPS_ALL`       |`SQ_SALL`|Enable all the steps                               |
 |`QK_SEQUENCER_STEPS_CLEAR`     |`SQ_SCLR`|Disable all the steps                              |
 |`QK_SEQUENCER_TEMPO_DOWN`      |`SQ_TMPD`|Decrease the tempo                                 |
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index 59159cb3fab..99c252d03ec 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -266,7 +266,7 @@ This enables syncing of the Host LED status (caps lock, num lock, etc) between b
 #define SPLIT_MODS_ENABLE
 ```
 
-This enables transmitting modifier state (normal, weak and oneshot) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen).
+This enables transmitting modifier state (normal, weak, oneshot and oneshot locked) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen).
 
 ```c
 #define SPLIT_WPM_ENABLE
diff --git a/docs/hand_wire.md b/docs/hand_wire.md
index 06809254df2..cfae38d6d20 100644
--- a/docs/hand_wire.md
+++ b/docs/hand_wire.md
@@ -175,7 +175,7 @@ As you move along, be sure that the controller is staying in place - recutting a
 
 From here, you should have a working keyboard once you program a firmware.
 
-Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix).
+Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website.  Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix)).
 
 Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware.  The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md).
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 65762234a44..9d722216a93 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -398,6 +398,22 @@ See also: [Leader Key](feature_leader_key.md)
 |---------|------------------------|
 |`QK_LEAD`|Begins a leader sequence|
 
+## LED Matrix :id=led-matrix
+
+See also: [LED Matrix](feature_led_matrix.md)
+
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
+
 ## Magic Keycodes :id=magic-keycodes
 
 See also: [Magic Keycodes](keycodes_magic.md)
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
deleted file mode 100644
index 244a5f192df..00000000000
--- a/keyboards/0xc7/61key/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 0xC7
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/0xc7/61key/keyboard.json b/keyboards/0xc7/61key/keyboard.json
index 6585b970c1e..ab5127db38a 100644
--- a/keyboards/0xc7/61key/keyboard.json
+++ b/keyboards/0xc7/61key/keyboard.json
@@ -20,6 +20,12 @@
         "mousekey": false,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 5791b324b65..5fec622271c 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* default setup after eeprom reset */
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
 /* Oled Size */
 #define OLED_DISPLAY_128X64
 #define OLED_FONT_END 255
diff --git a/keyboards/0xcb/1337/keyboard.json b/keyboards/0xcb/1337/keyboard.json
index 5b583dc291b..f264d4ed065 100644
--- a/keyboards/0xcb/1337/keyboard.json
+++ b/keyboards/0xcb/1337/keyboard.json
@@ -19,6 +19,10 @@
     ]
   },
   "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    },
     "tap_keycode_delay": 10
   },
   "qmk_lufa_bootloader": {
@@ -80,9 +84,11 @@
         {"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/0xcb/splaytoraid/32u4/keyboard.json b/keyboards/0xcb/splaytoraid/32u4/keyboard.json
new file mode 100644
index 00000000000..7c3f0590a6f
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/32u4/keyboard.json
@@ -0,0 +1,27 @@
+{
+    "development_board": "promicro",
+    "bootloader": "qmk-dfu",
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"],
+        "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgb_matrix": {
+        "animations": {
+            "band_sat": true,
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "raindrops": true
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"}
+        ]
+    },
+    "ws2812": {
+        "pin": "D0"
+    }
+}
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 1d47f7d77ca..8c32b0dc115 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -3,13 +3,6 @@
     "keyboard_name": "splaytoraid",
     "maintainer": "freya-irl",
     "url": "https://github.com/freya-irl/splaytoraid40",
-    "development_board": "promicro",
-    "bootloader": "qmk-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"],
-        "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"]
-    },
     "usb": {
         "device_version": "1.0.0",
         "pid": "0xCB00",
@@ -21,7 +14,8 @@
         "bootmagic": true,
         "console": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "encoder": true
     },
     "bootmagic": {
         "matrix": [1, 0]
@@ -29,21 +23,7 @@
     "build": {
         "lto": true
     },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B6", "resolution": 4}
-        ]
-    },
     "rgb_matrix": {
-        "animations": {
-            "breathing": true,
-            "band_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "raindrops": true,
-            "cycle_left_right": true
-        },
         "default": {
             "animation": "breathing",
             "hue": 152,
@@ -73,9 +53,6 @@
         ],
         "max_brightness": 200
     },
-    "ws2812": {
-        "pin": "D0"
-    },
     "layouts": {
         "LAYOUT_36": {
             "layout": [
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
deleted file mode 100644
index 49256b64827..00000000000
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "rgb_matrix": {
-        "animations": {
-            "cycle_up_down": true,
-            "jellybean_raindrops": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "pixel_fractal": true,
-            "rainbow_moving_chevron": true,
-            "cycle_pinwheel": true,
-            "pixel_rain": true,
-            "dual_beacon": true,
-            "hue_breathing": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true
-        }
-    },
-    "ws2812": {
-        "driver": "vendor"
-    }
-}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json
new file mode 100644
index 00000000000..b5a4f95c692
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json
@@ -0,0 +1,44 @@
+{
+    "development_board": "promicro_rp2040",
+    "matrix_pins": {
+        "cols": ["GP28", "GP27", "GP26", "GP29", "GP20", "GP22", "GP23"],
+        "rows": ["GP0", "GP1", "GP2", "GP4", "GP6", "GP7", "GP8", "GP5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgb_matrix": {
+        "animations": {
+            "band_sat": true,
+            "band_spiral_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "hue_breathing": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_moving_chevron": true,
+            "raindrops": true,
+            "solid_reactive": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP9", "pin_b": "GP21"}
+        ]
+    },
+    "ws2812": {
+        "pin": "GP3",
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
deleted file mode 100644
index 9617c1460ea..00000000000
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONVERT_TO = rp2040_ce
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 179c84088bb..60d9ff232a9 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* oled custom font */
 #define OLED_FONT_END 255
 #define OLED_FONT_H "gfxfont.c"
diff --git a/keyboards/0xcb/static/keyboard.json b/keyboards/0xcb/static/keyboard.json
index cd3d4928707..73a6a802cc5 100644
--- a/keyboards/0xcb/static/keyboard.json
+++ b/keyboards/0xcb/static/keyboard.json
@@ -32,6 +32,10 @@
     ]
   },
   "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    },
     "tap_keycode_delay": 10
   },
   "processor": "atmega328p",
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
deleted file mode 100644
index 17ebcaf4587..00000000000
--- a/keyboards/10bleoledhub/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "keyboard_name": "10bleoledhub",
-    "manufacturer": "haierwangwei2005",
-    "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
-    "maintainer": "haierwangwei2005",
-    "usb": {
-        "vid": "0x7C88",
-        "pid": "0x7C99",
-        "device_version": "0.0.1"
-    },
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    },
-    "rgblight": {
-        "led_count": 4,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B5"],
-        "rows": ["F0", "F5", "F4", "F6"]
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C7", "pin_b": "F7"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
-
-                {"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": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/10bleoledhub/keyboard.json b/keyboards/10bleoledhub/keyboard.json
new file mode 100644
index 00000000000..8f48e09127f
--- /dev/null
+++ b/keyboards/10bleoledhub/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "10bleoledhub",
+    "manufacturer": "haierwangwei2005",
+    "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
+    "maintainer": "haierwangwei2005",
+    "usb": {
+        "vid": "0x7C88",
+        "pid": "0x7C99",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bluetooth": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    },
+    "rgblight": {
+        "led_count": 4,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B5"],
+        "rows": ["F0", "F5", "F4", "F6"]
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C7", "pin_b": "F7"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"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": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk
index 12bfe122d62..3437a35bdf1 100644
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@@ -1,18 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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
-BLUETOOTH_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
deleted file mode 100644
index 34f33d50595..00000000000
--- a/keyboards/1k/info.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "keyboard_name": "1K",
-  "manufacturer": "MakotoKurauchi",
-  "url": "",
-  "maintainer": "MakotoKurauchi",
-  "usb": {
-    "vid": "0x0009",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 1
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "direct": [
-      ["B0"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT_ortho_1x1": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/1k/keyboard.json b/keyboards/1k/keyboard.json
new file mode 100644
index 00000000000..440856d0bd4
--- /dev/null
+++ b/keyboards/1k/keyboard.json
@@ -0,0 +1,39 @@
+{
+  "keyboard_name": "1K",
+  "manufacturer": "MakotoKurauchi",
+  "url": "",
+  "maintainer": "MakotoKurauchi",
+  "usb": {
+    "vid": "0x0009",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "processor": "attiny85",
+  "bootloader": "custom",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "grave_esc": false,
+    "magic": false,
+    "space_cadet": false
+  },
+  "rgblight": {
+    "led_count": 1
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "direct": [
+      ["B0"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT_ortho_1x1": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/1k/rules.mk b/keyboards/1k/rules.mk
index b3bd401f6ba..4078fe342aa 100644
--- a/keyboards/1k/rules.mk
+++ b/keyboards/1k/rules.mk
@@ -1,26 +1,2 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
 BOOTLOADER_SIZE = 1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
deleted file mode 100644
index d876570c808..00000000000
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/1upkeyboards/1up60hse/keyboard.json b/keyboards/1upkeyboards/1up60hse/keyboard.json
index ac8d5247121..990b51c1f84 100644
--- a/keyboards/1upkeyboards/1up60hse/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hse/keyboard.json
@@ -31,6 +31,12 @@
         "levels": 5,
         "breathing": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "rgblight": {
         "saturation_steps": 8,
         "brightness_steps": 8,
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
deleted file mode 100644
index eddf290b4c3..00000000000
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/1up60hte/keyboard.json b/keyboards/1upkeyboards/1up60hte/keyboard.json
index 25f519bea79..53e91017ddc 100644
--- a/keyboards/1upkeyboards/1up60hte/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hte/keyboard.json
@@ -26,6 +26,12 @@
         "rows": ["B3", "B2", "B1", "B0", "D4"]
     },
     "diode_direction": "COL2ROW",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/1up60rgb/keyboard.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
index 2985b5ae4f7..f4ba1112511 100644
--- a/keyboards/1upkeyboards/1up60rgb/keyboard.json
+++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json
@@ -18,6 +18,12 @@
     "nkro": true,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": 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"]
diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/1upslider8/info.json
rename to keyboards/1upkeyboards/1upslider8/keyboard.json
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
index 3512838186a..63f76eb1a65 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
index 230ce3d8574..ed1f1391261 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
index 47625ecc4dd..aa19a502b98 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
@@ -24,6 +24,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
+        "oled": true,
         "rgb_matrix": true
     },
     "matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 3451f44976a..48aea570e01 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE     = yes
-
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
deleted file mode 100644
index a697e565c9b..00000000000
--- a/keyboards/1upkeyboards/pi60/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60/keyboard.json b/keyboards/1upkeyboards/pi60/keyboard.json
index 71619db3605..45c3876a6b6 100644
--- a/keyboards/1upkeyboards/pi60/keyboard.json
+++ b/keyboards/1upkeyboards/pi60/keyboard.json
@@ -24,6 +24,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "ws2812": {
         "pin": "GP17",
         "driver": "vendor"
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
deleted file mode 100644
index 2c04274299f..00000000000
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/pi60_hse/keyboard.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json
index 204e42f48c7..d5a5f861873 100644
--- a/keyboards/1upkeyboards/pi60_hse/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_hse/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "ws2812": {
         "pin": "GP15",
         "driver": "vendor"
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
deleted file mode 100644
index 2c04274299f..00000000000
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/pi60_rgb/keyboard.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
index b6580e616a4..21dab3f71ae 100644
--- a/keyboards/1upkeyboards/pi60_rgb/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "ws2812": {
         "pin": "GP19",
         "driver": "vendor"
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
deleted file mode 100644
index 043d8b154b1..00000000000
--- a/keyboards/1upkeyboards/super16/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/1upkeyboards/super16/keyboard.json b/keyboards/1upkeyboards/super16/keyboard.json
index 4bc18e98f73..9da4168d471 100644
--- a/keyboards/1upkeyboards/super16/keyboard.json
+++ b/keyboards/1upkeyboards/super16/keyboard.json
@@ -86,6 +86,12 @@
     "nkro": false,
     "rgb_matrix": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D4", "C6", "F6", "F7"],
     "rows": ["D1", "D0", "F4", "F5"]
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 67af6d7cab8..6abfa8f431a 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -18,11 +18,6 @@
 
 #define MOUSEKEY_MOVE_DELTA 25
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/1upkeyboards/super16v2/keyboard.json b/keyboards/1upkeyboards/super16v2/keyboard.json
index 3bc7bf0e07f..652b03006e1 100644
--- a/keyboards/1upkeyboards/super16v2/keyboard.json
+++ b/keyboards/1upkeyboards/super16v2/keyboard.json
@@ -59,6 +59,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+      "locking": {
+        "enabled": true,
+        "resync": true
+      }
+    },
     "matrix_pins": {
       "cols": ["D5", "D6", "C2", "D0"],
       "rows": ["D1", "D2", "D3", "D4"]
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
deleted file mode 100644
index bbecccae020..00000000000
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "usb": {
-        "pid": "0x0161",
-        "device_version": "0.0.1"
-    },
-    "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": "B1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
-}
diff --git a/keyboards/1upkeyboards/sweet16/v1/keyboard.json b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
new file mode 100644
index 00000000000..3ac73ce8eb0
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
@@ -0,0 +1,99 @@
+{
+    "keyboard_name": "Sweet16",
+    "manufacturer": "1up Keyboards",
+    "url": "",
+    "maintainer": "skullydazed",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x0161",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "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": "B1"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "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/sweet16/v1/rules.mk b/keyboards/1upkeyboards/sweet16/v1/rules.mk
deleted file mode 100644
index 0912a1b4a60..00000000000
--- a/keyboards/1upkeyboards/sweet16/v1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
deleted file mode 100644
index 39e43b90cd3..00000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
index 0d09632a995..d8d6c5e3eae 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "ws2812": {
         "pin": "GP6",
         "driver": "vendor"
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
deleted file mode 100644
index 39e43b90cd3..00000000000
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
index d23bc6633d2..d46f723a17e 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
@@ -20,6 +20,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "ws2812": {
         "pin": "D7"
     },
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
deleted file mode 100644
index 2000c037f58..00000000000
--- a/keyboards/25keys/aleth42/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "keyboard_name": "ALETH42",
-    "manufacturer": "25KEYS",
-    "url": "http://www.sho-k.co.uk/tech/aleth42",
-    "maintainer": "monksoffunk",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEAC8"
-    }
-}
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
deleted file mode 100644
index 0d7a5de5605..00000000000
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
deleted file mode 100644
index 675c741bf52..00000000000
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
-        "rows": ["B0", "B1", "B2", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B6", "pin_b": "B7"},
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "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": "C7"
-    },
-    "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": [3, 10], "x": 11, "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, "w": 1.75},
-
-                {"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": [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, 4], "x": 6.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 9.75, "y": 3},
-                {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/25keys/aleth42/rev0/keyboard.json b/keyboards/25keys/aleth42/rev0/keyboard.json
new file mode 100644
index 00000000000..bbb566d9096
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev0/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "ALETH42",
+    "manufacturer": "25KEYS",
+    "url": "http://www.sho-k.co.uk/tech/aleth42",
+    "maintainer": "monksoffunk",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAC8",
+        "device_version": "0.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
+        "rows": ["B0", "B1", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B6", "pin_b": "B7"},
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "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": "C7"
+    },
+    "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": [3, 10], "x": 11, "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, "w": 1.75},
+
+                {"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": [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, 4], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 9.75, "y": 3},
+                {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
deleted file mode 100644
index e0954e7355b..00000000000
--- a/keyboards/25keys/aleth42/rev0/rules.mk
+++ /dev/null
@@ -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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
deleted file mode 100644
index 0d7a5de5605..00000000000
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
deleted file mode 100644
index fd4b07fe3ee..00000000000
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
-        "rows": ["B4", "B0", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B6"},
-            {"pin_a": "F5", "pin_b": "F6"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B3"
-    },
-    "backlight": {
-        "pin": "C6",
-        "levels": 8,
-        "breathing": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [3, 10], "x": 11, "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, "w": 1.75},
-
-                {"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": [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, 4], "x": 6.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 6], "x": 9.75, "y": 3},
-                {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/25keys/aleth42/rev1/keyboard.json b/keyboards/25keys/aleth42/rev1/keyboard.json
new file mode 100644
index 00000000000..0feab708a01
--- /dev/null
+++ b/keyboards/25keys/aleth42/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "ALETH42",
+    "manufacturer": "25KEYS",
+    "url": "http://www.sho-k.co.uk/tech/aleth42",
+    "maintainer": "monksoffunk",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAC8",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
+        "rows": ["B4", "B0", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"},
+            {"pin_a": "F5", "pin_b": "F6"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B3"
+    },
+    "backlight": {
+        "pin": "C6",
+        "levels": 8,
+        "breathing": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [3, 10], "x": 11, "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, "w": 1.75},
+
+                {"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": [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, 4], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 9.75, "y": 3},
+                {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
deleted file mode 100644
index 683b2498022..00000000000
--- a/keyboards/25keys/aleth42/rev1/rules.mk
+++ /dev/null
@@ -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 = yes        # 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 = yes       # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 1c4148a7d9f..83832a99474 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,5 +1,7 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "progmem.h"
+#include "rgblight.h"
+#include "oled_driver.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
deleted file mode 100644
index 38a73368f63..00000000000
--- a/keyboards/25keys/cassette42/info.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "keyboard_name": "cassette42",
-    "manufacturer": "monksoffunk",
-    "url": "http://www.sho-k.co.uk/tech/1246.html",
-    "maintainer": "monksoffunk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xCA42",
-        "device_version": "0.0.1"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B6", "pin_b": "B2"},
-            {"pin_a": "B3", "pin_b": "B1"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 5,
-        "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": [
-            ["B4", "F6", "F5", "F4", "B5", "F7"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0.5, "y": 0, "matrix": [0, 4]},
-                {"x": 2.5, "y": 0, "matrix": [0, 5]},
-                {"x": 0, "y": 1, "matrix": [0, 0]},
-                {"x": 1, "y": 1, "matrix": [0, 1]},
-                {"x": 2, "y": 1, "matrix": [0, 2]},
-                {"x": 3, "y": 1, "matrix": [0, 3]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/25keys/cassette42/keyboard.json b/keyboards/25keys/cassette42/keyboard.json
new file mode 100644
index 00000000000..cba2e612721
--- /dev/null
+++ b/keyboards/25keys/cassette42/keyboard.json
@@ -0,0 +1,65 @@
+{
+    "keyboard_name": "cassette42",
+    "manufacturer": "monksoffunk",
+    "url": "http://www.sho-k.co.uk/tech/1246.html",
+    "maintainer": "monksoffunk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA42",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "rgblight": true,
+        "encoder": true,
+        "oled": true
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B6", "pin_b": "B2"},
+            {"pin_a": "B3", "pin_b": "B1"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 5,
+        "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": [
+            ["B4", "F6", "F5", "F4", "B5", "F7"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0.5, "y": 0, "matrix": [0, 4]},
+                {"x": 2.5, "y": 0, "matrix": [0, 5]},
+                {"x": 0, "y": 1, "matrix": [0, 0]},
+                {"x": 1, "y": 1, "matrix": [0, 1]},
+                {"x": 2, "y": 1, "matrix": [0, 2]},
+                {"x": 3, "y": 1, "matrix": [0, 3]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
index f8febbdec8d..788ba43e591 100644
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-
 SRC += ./common/oled_helper.c
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
deleted file mode 100644
index 23502423168..00000000000
--- a/keyboards/25keys/zinc/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "manufacturer": "25KEYS",
-  "url": "https://github.com/monksoffunk/zinc",
-  "maintainer": "monksoffunk",
-   "usb": {
-    "vid": "0x04D8",
-    "pid": "0xEA3B",
-    "device_version": "0.0.1"
-   },
-   "rgb_matrix": {
-     "driver": "ws2812"
-   },
-  "processor": "atmega32u4",
-  "bootloader": "caterina"
-}
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
deleted file mode 100644
index 47fb1f2e98e..00000000000
--- a/keyboards/25keys/zinc/rev1/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "keyboard_name": "Zinc rev.1",
-  "matrix_pins": {
-    "cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
-    "rows": ["F6", "F7", "B1", "B3"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "tapping": {
-    "term": 100
-  },
-  "rgblight": {
-    "hue_steps": 10
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [4, 0], "x": 9, "y": 0},
-        {"matrix": [4, 1], "x": 10, "y": 0},
-        {"matrix": [4, 2], "x": 11, "y": 0},
-        {"matrix": [4, 3], "x": 12, "y": 0},
-        {"matrix": [4, 4], "x": 13, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
-        {"matrix": [5, 1], "x": 10, "y": 1},
-        {"matrix": [5, 2], "x": 11, "y": 1},
-        {"matrix": [5, 3], "x": 12, "y": 1},
-        {"matrix": [5, 4], "x": 13, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
-        {"matrix": [6, 1], "x": 10, "y": 2},
-        {"matrix": [6, 2], "x": 11, "y": 2},
-        {"matrix": [6, 3], "x": 12, "y": 2},
-        {"matrix": [6, 4], "x": 13, "y": 2},
-        {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3},
-        {"matrix": [7, 1], "x": 10, "y": 3},
-        {"matrix": [7, 2], "x": 11, "y": 3},
-        {"matrix": [7, 3], "x": 12, "y": 3},
-        {"matrix": [7, 4], "x": 13, "y": 3},
-        {"matrix": [7, 5], "x": 14, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/25keys/zinc/rev1/keyboard.json b/keyboards/25keys/zinc/rev1/keyboard.json
new file mode 100644
index 00000000000..c1bead2d8ab
--- /dev/null
+++ b/keyboards/25keys/zinc/rev1/keyboard.json
@@ -0,0 +1,99 @@
+{
+  "keyboard_name": "Zinc rev.1",
+  "manufacturer": "25KEYS",
+  "url": "https://github.com/monksoffunk/zinc",
+  "maintainer": "monksoffunk",
+  "usb": {
+    "vid": "0x04D8",
+    "pid": "0xEA3B",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
+    "rows": ["F6", "F7", "B1", "B3"]
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": false
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "tapping": {
+    "term": 100
+  },
+  "rgb_matrix": {
+    "driver": "ws2812"
+  },
+  "rgblight": {
+    "hue_steps": 10
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 4], "x": 13, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 4], "x": 13, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 4], "x": 13, "y": 2},
+        {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 2], "x": 11, "y": 3},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 4], "x": 13, "y": 3},
+        {"matrix": [7, 5], "x": 14, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/25keys/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk
deleted file mode 100644
index d38a6180907..00000000000
--- a/keyboards/25keys/zinc/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
deleted file mode 100644
index 1ab2fb7e38f..00000000000
--- a/keyboards/25keys/zinc/reva/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "keyboard_name": "Zinc rev.A",
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-    "rows": ["D4", "C6", "D7", "E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "tapping": {
-    "term": 100
-  },
-  "rgblight": {
-    "hue_steps": 10
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [4, 0], "x": 9, "y": 0},
-        {"matrix": [4, 1], "x": 10, "y": 0},
-        {"matrix": [4, 2], "x": 11, "y": 0},
-        {"matrix": [4, 3], "x": 12, "y": 0},
-        {"matrix": [4, 4], "x": 13, "y": 0},
-        {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
-        {"matrix": [5, 1], "x": 10, "y": 1},
-        {"matrix": [5, 2], "x": 11, "y": 1},
-        {"matrix": [5, 3], "x": 12, "y": 1},
-        {"matrix": [5, 4], "x": 13, "y": 1},
-        {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
-        {"matrix": [6, 1], "x": 10, "y": 2},
-        {"matrix": [6, 2], "x": 11, "y": 2},
-        {"matrix": [6, 3], "x": 12, "y": 2},
-        {"matrix": [6, 4], "x": 13, "y": 2},
-        {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3},
-        {"matrix": [7, 1], "x": 10, "y": 3},
-        {"matrix": [7, 2], "x": 11, "y": 3},
-        {"matrix": [7, 3], "x": 12, "y": 3},
-        {"matrix": [7, 4], "x": 13, "y": 3},
-        {"matrix": [7, 5], "x": 14, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/25keys/zinc/reva/keyboard.json b/keyboards/25keys/zinc/reva/keyboard.json
new file mode 100644
index 00000000000..01d2291c491
--- /dev/null
+++ b/keyboards/25keys/zinc/reva/keyboard.json
@@ -0,0 +1,96 @@
+{
+  "keyboard_name": "Zinc rev.A",
+  "manufacturer": "25KEYS",
+  "url": "https://github.com/monksoffunk/zinc",
+  "maintainer": "monksoffunk",
+  "usb": {
+    "vid": "0x04D8",
+    "pid": "0xEA3B",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": false
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "tapping": {
+    "term": 100
+  },
+  "rgb_matrix": {
+    "driver": "ws2812"
+  },
+  "rgblight": {
+    "hue_steps": 10
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [4, 0], "x": 9, "y": 0},
+        {"matrix": [4, 1], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 4], "x": 13, "y": 0},
+        {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
+        {"matrix": [5, 1], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 4], "x": 13, "y": 1},
+        {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
+        {"matrix": [6, 1], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 4], "x": 13, "y": 2},
+        {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3},
+        {"matrix": [7, 1], "x": 10, "y": 3},
+        {"matrix": [7, 2], "x": 11, "y": 3},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 4], "x": 13, "y": 3},
+        {"matrix": [7, 5], "x": 14, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/25keys/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk
deleted file mode 100644
index 83895bdcb87..00000000000
--- a/keyboards/25keys/zinc/reva/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index 1e1d687ebbe..1edcb0a3455 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-RGB_MATRIX_ENABLE = no
-
 DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/2key2crawl/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/2key2crawl/keyboard.json b/keyboards/2key2crawl/keyboard.json
index 4dfecbd696f..fec55c811a6 100644
--- a/keyboards/2key2crawl/keyboard.json
+++ b/keyboards/2key2crawl/keyboard.json
@@ -17,6 +17,12 @@
         "mousekey": false,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B3", "B4", "B5", "B6", "B7", "C7", "B2"],
         "rows": ["C4", "C5"]
diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json
deleted file mode 100644
index 2db9363564d..00000000000
--- a/keyboards/3w6/rev1/info.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.8},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.2},
-                {"matrix": [0, 4], "x": 4, "y": 0.4},
-
-                {"matrix": [4, 0], "x": 8, "y": 0.4},
-                {"matrix": [4, 1], "x": 9, "y": 0.2},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.2},
-                {"matrix": [4, 4], "x": 12, "y": 0.8},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.8},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.2},
-                {"matrix": [1, 4], "x": 4, "y": 1.4},
-
-                {"matrix": [5, 0], "x": 8, "y": 1.4},
-                {"matrix": [5, 1], "x": 9, "y": 1.2},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.2},
-                {"matrix": [5, 4], "x": 12, "y": 1.8},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.8},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.2},
-                {"matrix": [2, 4], "x": 4, "y": 2.4},
-
-                {"matrix": [6, 0], "x": 8, "y": 2.4},
-                {"matrix": [6, 1], "x": 9, "y": 2.2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.2},
-                {"matrix": [6, 4], "x": 12, "y": 2.8},
-
-                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
-                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
-                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
-                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
-                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
-                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/3w6/rev1/keyboard.json b/keyboards/3w6/rev1/keyboard.json
new file mode 100644
index 00000000000..478c79b9427
--- /dev/null
+++ b/keyboards/3w6/rev1/keyboard.json
@@ -0,0 +1,64 @@
+{
+    "usb": {
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/3w6/rev1/rules.mk b/keyboards/3w6/rev1/rules.mk
index b7988ce4f55..cea39bb5c90 100644
--- a/keyboards/3w6/rev1/rules.mk
+++ b/keyboards/3w6/rev1/rules.mk
@@ -1,19 +1,3 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json
deleted file mode 100644
index 70ee0e0fcac..00000000000
--- a/keyboards/3w6/rev2/info.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.8},
-                {"matrix": [0, 1], "x": 1, "y": 0.2},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.2},
-                {"matrix": [0, 4], "x": 4, "y": 0.4},
-
-                {"matrix": [4, 0], "x": 8, "y": 0.4},
-                {"matrix": [4, 1], "x": 9, "y": 0.2},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.2},
-                {"matrix": [4, 4], "x": 12, "y": 0.8},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.8},
-                {"matrix": [1, 1], "x": 1, "y": 1.2},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.2},
-                {"matrix": [1, 4], "x": 4, "y": 1.4},
-
-                {"matrix": [5, 0], "x": 8, "y": 1.4},
-                {"matrix": [5, 1], "x": 9, "y": 1.2},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.2},
-                {"matrix": [5, 4], "x": 12, "y": 1.8},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.8},
-                {"matrix": [2, 1], "x": 1, "y": 2.2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.2},
-                {"matrix": [2, 4], "x": 4, "y": 2.4},
-
-                {"matrix": [6, 0], "x": 8, "y": 2.4},
-                {"matrix": [6, 1], "x": 9, "y": 2.2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.2},
-                {"matrix": [6, 4], "x": 12, "y": 2.8},
-
-                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
-                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
-                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
-                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
-                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
-                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/3w6/rev2/keyboard.json b/keyboards/3w6/rev2/keyboard.json
new file mode 100644
index 00000000000..f3981e88d98
--- /dev/null
+++ b/keyboards/3w6/rev2/keyboard.json
@@ -0,0 +1,64 @@
+{
+    "usb": {
+        "device_version": "0.0.2",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.8},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+                {"matrix": [4, 0], "x": 8, "y": 0.4},
+                {"matrix": [4, 1], "x": 9, "y": 0.2},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.2},
+                {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.8},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+                {"matrix": [5, 0], "x": 8, "y": 1.4},
+                {"matrix": [5, 1], "x": 9, "y": 1.2},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.2},
+                {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.8},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+                {"matrix": [6, 0], "x": 8, "y": 2.4},
+                {"matrix": [6, 1], "x": 9, "y": 2.2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.2},
+                {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+                {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+                {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+                {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+                {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+                {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+                {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
index 0db58bfabd6..c32f2a04d21 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
@@ -14,8 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include QMK_KEYBOARD_H
 #include "pimoroni_trackball.h"
 #include "i2c_master.h"
+#include "action.h"
+#include "timer.h"
+#include "print.h"
 
 static uint8_t scrolling      = 0;
 static int16_t x_offset       = 0;
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
index ca2559bec74..d85d4e60a9c 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "pointing_device.h"
+#include "report.h"
 
 #ifndef TRACKBALL_ADDRESS
 #    define TRACKBALL_ADDRESS (0x0A << 1)
diff --git a/keyboards/3w6/rev2/rules.mk b/keyboards/3w6/rev2/rules.mk
index b7988ce4f55..cea39bb5c90 100644
--- a/keyboards/3w6/rev2/rules.mk
+++ b/keyboards/3w6/rev2/rules.mk
@@ -1,19 +1,3 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 20ecf947080..1710ba42ee9 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -21,11 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
deleted file mode 100644
index b5ab2c0cbdb..00000000000
--- a/keyboards/40percentclub/25/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "The 5x5 Keyboard",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x0F25",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_5x5", "ortho_5x10"],
-    "layout_aliases": {
-        "LAYOUT_macro": "LAYOUT_ortho_5x5",
-        "LAYOUT_split": "LAYOUT_ortho_5x10"
-    },
-    "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": [5, 4], "x": 5, "y": 0},
-                {"matrix": [5, 3], "x": 6, "y": 0},
-                {"matrix": [5, 2], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 0], "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": [6, 4], "x": 5, "y": 1},
-                {"matrix": [6, 3], "x": 6, "y": 1},
-                {"matrix": [6, 2], "x": 7, "y": 1},
-                {"matrix": [6, 1], "x": 8, "y": 1},
-                {"matrix": [6, 0], "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": [7, 4], "x": 5, "y": 2},
-                {"matrix": [7, 3], "x": 6, "y": 2},
-                {"matrix": [7, 2], "x": 7, "y": 2},
-                {"matrix": [7, 1], "x": 8, "y": 2},
-                {"matrix": [7, 0], "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": [8, 4], "x": 5, "y": 3},
-                {"matrix": [8, 3], "x": 6, "y": 3},
-                {"matrix": [8, 2], "x": 7, "y": 3},
-                {"matrix": [8, 1], "x": 8, "y": 3},
-                {"matrix": [8, 0], "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": [9, 4], "x": 5, "y": 4},
-                {"matrix": [9, 3], "x": 6, "y": 4},
-                {"matrix": [9, 2], "x": 7, "y": 4},
-                {"matrix": [9, 1], "x": 8, "y": 4},
-                {"matrix": [9, 0], "x": 9, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/25/keyboard.json b/keyboards/40percentclub/25/keyboard.json
new file mode 100644
index 00000000000..aede80ef172
--- /dev/null
+++ b/keyboards/40percentclub/25/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "The 5x5 Keyboard",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F25",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_5x5", "ortho_5x10"],
+    "layout_aliases": {
+        "LAYOUT_macro": "LAYOUT_ortho_5x5",
+        "LAYOUT_split": "LAYOUT_ortho_5x10"
+    },
+    "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": [5, 4], "x": 5, "y": 0},
+                {"matrix": [5, 3], "x": 6, "y": 0},
+                {"matrix": [5, 2], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 0], "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": [6, 4], "x": 5, "y": 1},
+                {"matrix": [6, 3], "x": 6, "y": 1},
+                {"matrix": [6, 2], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 0], "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": [7, 4], "x": 5, "y": 2},
+                {"matrix": [7, 3], "x": 6, "y": 2},
+                {"matrix": [7, 2], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 0], "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": [8, 4], "x": 5, "y": 3},
+                {"matrix": [8, 3], "x": 6, "y": 3},
+                {"matrix": [8, 2], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 0], "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": [9, 4], "x": 5, "y": 4},
+                {"matrix": [9, 3], "x": 6, "y": 4},
+                {"matrix": [9, 2], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 0], "x": 9, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/25/rules.mk b/keyboards/40percentclub/25/rules.mk
deleted file mode 100644
index 25d4c400516..00000000000
--- a/keyboards/40percentclub/25/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes        # 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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
deleted file mode 100644
index b0cf6b6f6ae..00000000000
--- a/keyboards/40percentclub/4pack/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Arda Kilicdagi
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/4pack/keyboard.json b/keyboards/40percentclub/4pack/keyboard.json
index edfd64ad33e..a114e97dbbd 100644
--- a/keyboards/40percentclub/4pack/keyboard.json
+++ b/keyboards/40percentclub/4pack/keyboard.json
@@ -23,6 +23,12 @@
         "mousekey": false,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+       }
+    },
     "matrix_pins": {
         "direct": [
             ["E6", "D7", "C6", "D4"]
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
deleted file mode 100644
index 7caa265c1a1..00000000000
--- a/keyboards/40percentclub/4x4/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
deleted file mode 100644
index aa5e0396375..00000000000
--- a/keyboards/40percentclub/4x4/info.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-    "keyboard_name": "The 4x4 Keyboard",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x0A0C",
-        "device_version": "44.4.4"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
-        "rows": ["B2", "D1", "D0", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_4x4", "ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x4": {
-            "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]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2, "matrix": [2, 3]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 3, "y": 3, "matrix": [3, 3]}
-            ]
-        },
-        "LAYOUT_ortho_4x8": {
-            "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": 4, "y": 0, "matrix": [0, 4]},
-                {"x": 5, "y": 0, "matrix": [0, 5]},
-                {"x": 6, "y": 0, "matrix": [0, 6]},
-                {"x": 7, "y": 0, "matrix": [0, 7]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1, "matrix": [1, 3]},
-                {"x": 4, "y": 1, "matrix": [1, 4]},
-                {"x": 5, "y": 1, "matrix": [1, 5]},
-                {"x": 6, "y": 1, "matrix": [1, 6]},
-                {"x": 7, "y": 1, "matrix": [1, 7]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2, "matrix": [2, 3]},
-                {"x": 4, "y": 2, "matrix": [2, 4]},
-                {"x": 5, "y": 2, "matrix": [2, 5]},
-                {"x": 6, "y": 2, "matrix": [2, 6]},
-                {"x": 7, "y": 2, "matrix": [2, 7]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 3, "y": 3, "matrix": [3, 3]},
-                {"x": 4, "y": 3, "matrix": [3, 4]},
-                {"x": 5, "y": 3, "matrix": [3, 5]},
-                {"x": 6, "y": 3, "matrix": [3, 6]},
-                {"x": 7, "y": 3, "matrix": [3, 7]}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "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": 4, "y": 0, "matrix": [0, 4]},
-                {"x": 5, "y": 0, "matrix": [0, 5]},
-                {"x": 6, "y": 0, "matrix": [0, 6]},
-                {"x": 7, "y": 0, "matrix": [0, 7]},
-                {"x": 8, "y": 0, "matrix": [0, 8]},
-                {"x": 9, "y": 0, "matrix": [0, 9]},
-                {"x": 10, "y": 0, "matrix": [0, 10]},
-                {"x": 11, "y": 0, "matrix": [0, 11]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1, "matrix": [1, 3]},
-                {"x": 4, "y": 1, "matrix": [1, 4]},
-                {"x": 5, "y": 1, "matrix": [1, 5]},
-                {"x": 6, "y": 1, "matrix": [1, 6]},
-                {"x": 7, "y": 1, "matrix": [1, 7]},
-                {"x": 8, "y": 1, "matrix": [1, 8]},
-                {"x": 9, "y": 1, "matrix": [1, 9]},
-                {"x": 10, "y": 1, "matrix": [1, 10]},
-                {"x": 11, "y": 1, "matrix": [1, 11]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2, "matrix": [2, 3]},
-                {"x": 4, "y": 2, "matrix": [2, 4]},
-                {"x": 5, "y": 2, "matrix": [2, 5]},
-                {"x": 6, "y": 2, "matrix": [2, 6]},
-                {"x": 7, "y": 2, "matrix": [2, 7]},
-                {"x": 8, "y": 2, "matrix": [2, 8]},
-                {"x": 9, "y": 2, "matrix": [2, 9]},
-                {"x": 10, "y": 2, "matrix": [2, 10]},
-                {"x": 11, "y": 2, "matrix": [2, 11]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 3, "y": 3, "matrix": [3, 3]},
-                {"x": 4, "y": 3, "matrix": [3, 4]},
-                {"x": 5, "y": 3, "matrix": [3, 5]},
-                {"x": 6, "y": 3, "matrix": [3, 6]},
-                {"x": 7, "y": 3, "matrix": [3, 7]},
-                {"x": 8, "y": 3, "matrix": [3, 8]},
-                {"x": 9, "y": 3, "matrix": [3, 9]},
-                {"x": 10, "y": 3, "matrix": [3, 10]},
-                {"x": 11, "y": 3, "matrix": [3, 11]}
-            ]
-        },
-        "LAYOUT_ortho_4x16": {
-            "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": 4, "y": 0, "matrix": [0, 4]},
-                {"x": 5, "y": 0, "matrix": [0, 5]},
-                {"x": 6, "y": 0, "matrix": [0, 6]},
-                {"x": 7, "y": 0, "matrix": [0, 7]},
-                {"x": 8, "y": 0, "matrix": [0, 8]},
-                {"x": 9, "y": 0, "matrix": [0, 9]},
-                {"x": 10, "y": 0, "matrix": [0, 10]},
-                {"x": 11, "y": 0, "matrix": [0, 11]},
-                {"x": 12, "y": 0, "matrix": [0, 12]},
-                {"x": 13, "y": 0, "matrix": [0, 13]},
-                {"x": 14, "y": 0, "matrix": [0, 14]},
-                {"x": 15, "y": 0, "matrix": [0, 15]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1, "matrix": [1, 3]},
-                {"x": 4, "y": 1, "matrix": [1, 4]},
-                {"x": 5, "y": 1, "matrix": [1, 5]},
-                {"x": 6, "y": 1, "matrix": [1, 6]},
-                {"x": 7, "y": 1, "matrix": [1, 7]},
-                {"x": 8, "y": 1, "matrix": [1, 8]},
-                {"x": 9, "y": 1, "matrix": [1, 9]},
-                {"x": 10, "y": 1, "matrix": [1, 10]},
-                {"x": 11, "y": 1, "matrix": [1, 11]},
-                {"x": 12, "y": 1, "matrix": [1, 12]},
-                {"x": 13, "y": 1, "matrix": [1, 13]},
-                {"x": 14, "y": 1, "matrix": [1, 14]},
-                {"x": 15, "y": 1, "matrix": [1, 15]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2, "matrix": [2, 3]},
-                {"x": 4, "y": 2, "matrix": [2, 4]},
-                {"x": 5, "y": 2, "matrix": [2, 5]},
-                {"x": 6, "y": 2, "matrix": [2, 6]},
-                {"x": 7, "y": 2, "matrix": [2, 7]},
-                {"x": 8, "y": 2, "matrix": [2, 8]},
-                {"x": 9, "y": 2, "matrix": [2, 9]},
-                {"x": 10, "y": 2, "matrix": [2, 10]},
-                {"x": 11, "y": 2, "matrix": [2, 11]},
-                {"x": 12, "y": 2, "matrix": [2, 12]},
-                {"x": 13, "y": 2, "matrix": [2, 13]},
-                {"x": 14, "y": 2, "matrix": [2, 14]},
-                {"x": 15, "y": 2, "matrix": [2, 15]},
-
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 3, "y": 3, "matrix": [3, 3]},
-                {"x": 4, "y": 3, "matrix": [3, 4]},
-                {"x": 5, "y": 3, "matrix": [3, 5]},
-                {"x": 6, "y": 3, "matrix": [3, 6]},
-                {"x": 7, "y": 3, "matrix": [3, 7]},
-                {"x": 8, "y": 3, "matrix": [3, 8]},
-                {"x": 9, "y": 3, "matrix": [3, 9]},
-                {"x": 10, "y": 3, "matrix": [3, 10]},
-                {"x": 11, "y": 3, "matrix": [3, 11]},
-                {"x": 12, "y": 3, "matrix": [3, 12]},
-                {"x": 13, "y": 3, "matrix": [3, 13]},
-                {"x": 14, "y": 3, "matrix": [3, 14]},
-                {"x": 15, "y": 3, "matrix": [3, 15]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/4x4/keyboard.json b/keyboards/40percentclub/4x4/keyboard.json
new file mode 100644
index 00000000000..735a3865da3
--- /dev/null
+++ b/keyboards/40percentclub/4x4/keyboard.json
@@ -0,0 +1,222 @@
+{
+    "keyboard_name": "The 4x4 Keyboard",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0A0C",
+        "device_version": "44.4.4"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+        "rows": ["B2", "D1", "D0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["ortho_4x4", "ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "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]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]}
+            ]
+        },
+        "LAYOUT_ortho_4x8": {
+            "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": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "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": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
+                {"x": 8, "y": 2, "matrix": [2, 8]},
+                {"x": 9, "y": 2, "matrix": [2, 9]},
+                {"x": 10, "y": 2, "matrix": [2, 10]},
+                {"x": 11, "y": 2, "matrix": [2, 11]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]},
+                {"x": 8, "y": 3, "matrix": [3, 8]},
+                {"x": 9, "y": 3, "matrix": [3, 9]},
+                {"x": 10, "y": 3, "matrix": [3, 10]},
+                {"x": 11, "y": 3, "matrix": [3, 11]}
+            ]
+        },
+        "LAYOUT_ortho_4x16": {
+            "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": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
+                {"x": 15, "y": 0, "matrix": [0, 15]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
+                {"x": 12, "y": 1, "matrix": [1, 12]},
+                {"x": 13, "y": 1, "matrix": [1, 13]},
+                {"x": 14, "y": 1, "matrix": [1, 14]},
+                {"x": 15, "y": 1, "matrix": [1, 15]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
+                {"x": 8, "y": 2, "matrix": [2, 8]},
+                {"x": 9, "y": 2, "matrix": [2, 9]},
+                {"x": 10, "y": 2, "matrix": [2, 10]},
+                {"x": 11, "y": 2, "matrix": [2, 11]},
+                {"x": 12, "y": 2, "matrix": [2, 12]},
+                {"x": 13, "y": 2, "matrix": [2, 13]},
+                {"x": 14, "y": 2, "matrix": [2, 14]},
+                {"x": 15, "y": 2, "matrix": [2, 15]},
+
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]},
+                {"x": 8, "y": 3, "matrix": [3, 8]},
+                {"x": 9, "y": 3, "matrix": [3, 9]},
+                {"x": 10, "y": 3, "matrix": [3, 10]},
+                {"x": 11, "y": 3, "matrix": [3, 11]},
+                {"x": 12, "y": 3, "matrix": [3, 12]},
+                {"x": 13, "y": 3, "matrix": [3, 13]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
+                {"x": 15, "y": 3, "matrix": [3, 15]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/4x4/rules.mk b/keyboards/40percentclub/4x4/rules.mk
index dfb1a682dcb..16051206467 100644
--- a/keyboards/40percentclub/4x4/rules.mk
+++ b/keyboards/40percentclub/4x4/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
deleted file mode 100644
index 7caa265c1a1..00000000000
--- a/keyboards/40percentclub/5x5/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/5x5/keyboard.json b/keyboards/40percentclub/5x5/keyboard.json
index 0a50d29ffe7..039d9fe47b1 100644
--- a/keyboards/40percentclub/5x5/keyboard.json
+++ b/keyboards/40percentclub/5x5/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+       }
+    },
     "matrix_pins": {
         "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
         "rows": ["B2", "D1", "D0", "D4", "C6"]
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 20ecf947080..1710ba42ee9 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -21,11 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
deleted file mode 100644
index 00e91edb42f..00000000000
--- a/keyboards/40percentclub/6lit/info.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "keyboard_name": "The 6lit Macropad",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x0F61",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1"],
-        "rows": ["D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_2x3", "ortho_2x6"],
-    "layout_aliases": {
-        "LAYOUT_macro": "LAYOUT_ortho_2x3",
-        "LAYOUT_split": "LAYOUT_ortho_2x6"
-    },
-    "layouts": {
-        "LAYOUT_ortho_2x3": {
-            "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}
-            ]
-        },
-        "LAYOUT_ortho_2x6": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [2, 2], "x": 3, "y": 0},
-                {"matrix": [2, 1], "x": 4, "y": 0},
-                {"matrix": [2, 0], "x": 5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [3, 2], "x": 3, "y": 1},
-                {"matrix": [3, 1], "x": 4, "y": 1},
-                {"matrix": [3, 0], "x": 5, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/6lit/keyboard.json b/keyboards/40percentclub/6lit/keyboard.json
new file mode 100644
index 00000000000..06ffc890d2b
--- /dev/null
+++ b/keyboards/40percentclub/6lit/keyboard.json
@@ -0,0 +1,70 @@
+{
+    "keyboard_name": "The 6lit Macropad",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F61",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1"],
+        "rows": ["D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_2x3", "ortho_2x6"],
+    "layout_aliases": {
+        "LAYOUT_macro": "LAYOUT_ortho_2x3",
+        "LAYOUT_split": "LAYOUT_ortho_2x6"
+    },
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "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}
+            ]
+        },
+        "LAYOUT_ortho_2x6": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [2, 2], "x": 3, "y": 0},
+                {"matrix": [2, 1], "x": 4, "y": 0},
+                {"matrix": [2, 0], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [3, 2], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [3, 0], "x": 5, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk
deleted file mode 100644
index 25d4c400516..00000000000
--- a/keyboards/40percentclub/6lit/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes        # 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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 20ecf947080..1710ba42ee9 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -21,11 +21,6 @@
 //#define MASTER_RIGHT
 //#define EE_HANDS
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
deleted file mode 100644
index 89fc4d11a01..00000000000
--- a/keyboards/40percentclub/foobar/info.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "keyboard_name": "The foobar Keyboard",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x4025",
-        "pid": "0x0F00",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_3x10"],
-    "layout_aliases": {
-        "LAYOUT_macro": "LAYOUT_ortho_3x5",
-        "LAYOUT_split": "LAYOUT_ortho_3x10"
-    },
-    "layouts": {
-        "LAYOUT_ortho_3x5": {
-            "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}
-            ]
-        },
-        "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": [3, 4], "x": 5, "y": 0},
-                {"matrix": [3, 3], "x": 6, "y": 0},
-                {"matrix": [3, 2], "x": 7, "y": 0},
-                {"matrix": [3, 1], "x": 8, "y": 0},
-                {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1},
-                {"matrix": [4, 3], "x": 6, "y": 1},
-                {"matrix": [4, 2], "x": 7, "y": 1},
-                {"matrix": [4, 1], "x": 8, "y": 1},
-                {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2},
-                {"matrix": [5, 3], "x": 6, "y": 2},
-                {"matrix": [5, 2], "x": 7, "y": 2},
-                {"matrix": [5, 1], "x": 8, "y": 2},
-                {"matrix": [5, 0], "x": 9, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/foobar/keyboard.json b/keyboards/40percentclub/foobar/keyboard.json
new file mode 100644
index 00000000000..0a2769e04a6
--- /dev/null
+++ b/keyboards/40percentclub/foobar/keyboard.json
@@ -0,0 +1,99 @@
+{
+    "keyboard_name": "The foobar Keyboard",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F00",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["ortho_3x10"],
+    "layout_aliases": {
+        "LAYOUT_macro": "LAYOUT_ortho_3x5",
+        "LAYOUT_split": "LAYOUT_ortho_3x10"
+    },
+    "layouts": {
+        "LAYOUT_ortho_3x5": {
+            "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}
+            ]
+        },
+        "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": [3, 4], "x": 5, "y": 0},
+                {"matrix": [3, 3], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 1], "x": 8, "y": 0},
+                {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 1], "x": 8, "y": 1},
+                {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 0], "x": 9, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/foobar/rules.mk b/keyboards/40percentclub/foobar/rules.mk
deleted file mode 100644
index 25d4c400516..00000000000
--- a/keyboards/40percentclub/foobar/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes        # 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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index 808a82d4cea..d531c9408c1 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -8,16 +8,13 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
-  "matrix_pins": {
-    "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
-    "rows": ["F7", "B1", "B3", "B2", "B6"]
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true,
+    "backlight": true
   },
-  "diode_direction": "COL2ROW",
-  "backlight": {
-    "pin": "B5"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
   "community_layouts": ["ortho_3x10"],
   "layouts": {
     "LAYOUT_ortho_3x10": {
diff --git a/keyboards/40percentclub/gherkin/kb2040/keyboard.json b/keyboards/40percentclub/gherkin/kb2040/keyboard.json
new file mode 100644
index 00000000000..431ac371eeb
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/kb2040/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "development_board": "kb2040",
+    "matrix_pins": {
+        "cols": ["GP8", "GP7", "GP6", "GP5", "GP4", "GP3"],
+        "rows": ["GP26", "GP18", "GP20", "GP19", "GP10"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "GP9",
+        "driver": "software"
+    }
+}
diff --git a/keyboards/40percentclub/gherkin/kb2040/rules.mk b/keyboards/40percentclub/gherkin/kb2040/rules.mk
deleted file mode 100644
index 982c5817025..00000000000
--- a/keyboards/40percentclub/gherkin/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONVERT_TO = kb2040
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
index f4d3032857c..420890a1083 100644
--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
@@ -50,26 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 
 };
-
-void keyboard_pre_init_user(void) {
-  // Call the keyboard pre init code.
-
-  // Set our LED pins as output
-  setPinOutput(D5);
-  setPinOutput(B0);
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.num_lock) {
-    writePinLow(D5);
-  } else {
-    writePinHigh(D5);
-  }
-
-  if (led_state.caps_lock) {
-    writePinLow(B0);
-  } else {
-    writePinHigh(B0);
-  }
-  return false;
-}
diff --git a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
new file mode 100644
index 00000000000..882ea8f72b2
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "num_lock": "D5",
+        "caps_lock": "B0",
+        "on_state": 0
+    },
+    "backlight": {
+        "pin": "B5"
+    }
+}
diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk
deleted file mode 100644
index e47c1c65726..00000000000
--- a/keyboards/40percentclub/gherkin/rules.mk
+++ /dev/null
@@ -1,16 +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 = no
-
-# Disable unsupported hardware
-RGBLIGHT_SUPPORTED = no
-AUDIO_SUPPORTED = no
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
deleted file mode 100644
index 8b4ccf14793..00000000000
--- a/keyboards/40percentclub/half_n_half/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Boy_314
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
deleted file mode 100644
index 8174e639c23..00000000000
--- a/keyboards/40percentclub/half_n_half/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "keyboard_name": "half_n_half",
-  "manufacturer": "di0ib",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x4A1F",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-    "rows": ["D4", "C6", "D7", "E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "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": [4, 6], "x": 7, "y": 0},
-        {"matrix": [4, 5], "x": 8, "y": 0},
-        {"matrix": [4, 4], "x": 9, "y": 0},
-        {"matrix": [4, 3], "x": 10, "y": 0},
-        {"matrix": [4, 2], "x": 11, "y": 0},
-        {"matrix": [4, 1], "x": 12, "y": 0},
-        {"matrix": [4, 0], "x": 13, "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": [5, 6], "x": 7, "y": 1},
-        {"matrix": [5, 5], "x": 8, "y": 1},
-        {"matrix": [5, 4], "x": 9, "y": 1},
-        {"matrix": [5, 3], "x": 10, "y": 1},
-        {"matrix": [5, 2], "x": 11, "y": 1},
-        {"matrix": [5, 1], "x": 12, "y": 1},
-        {"matrix": [5, 0], "x": 13, "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": [6, 6], "x": 7, "y": 2},
-        {"matrix": [6, 5], "x": 8, "y": 2},
-        {"matrix": [6, 4], "x": 9, "y": 2},
-        {"matrix": [6, 3], "x": 10, "y": 2},
-        {"matrix": [6, 2], "x": 11, "y": 2},
-        {"matrix": [6, 1], "x": 12, "y": 2},
-        {"matrix": [6, 0], "x": 13, "y": 2},
-
-        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-
-        {"matrix": [7, 4], "x": 8, "y": 3, "w": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/half_n_half/keyboard.json b/keyboards/40percentclub/half_n_half/keyboard.json
new file mode 100644
index 00000000000..3e0c646a500
--- /dev/null
+++ b/keyboards/40percentclub/half_n_half/keyboard.json
@@ -0,0 +1,92 @@
+{
+  "keyboard_name": "half_n_half",
+  "manufacturer": "di0ib",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4A1F",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "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": [4, 6], "x": 7, "y": 0},
+        {"matrix": [4, 5], "x": 8, "y": 0},
+        {"matrix": [4, 4], "x": 9, "y": 0},
+        {"matrix": [4, 3], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0},
+        {"matrix": [4, 1], "x": 12, "y": 0},
+        {"matrix": [4, 0], "x": 13, "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": [5, 6], "x": 7, "y": 1},
+        {"matrix": [5, 5], "x": 8, "y": 1},
+        {"matrix": [5, 4], "x": 9, "y": 1},
+        {"matrix": [5, 3], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1},
+        {"matrix": [5, 1], "x": 12, "y": 1},
+        {"matrix": [5, 0], "x": 13, "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": [6, 6], "x": 7, "y": 2},
+        {"matrix": [6, 5], "x": 8, "y": 2},
+        {"matrix": [6, 4], "x": 9, "y": 2},
+        {"matrix": [6, 3], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2},
+        {"matrix": [6, 1], "x": 12, "y": 2},
+        {"matrix": [6, 0], "x": 13, "y": 2},
+
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+        {"matrix": [7, 4], "x": 8, "y": 3, "w": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/half_n_half/rules.mk b/keyboards/40percentclub/half_n_half/rules.mk
deleted file mode 100644
index 8ee80d039b8..00000000000
--- a/keyboards/40percentclub/half_n_half/rules.mk
+++ /dev/null
@@ -1,15 +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 backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
deleted file mode 100644
index 0fe9b9df213..00000000000
--- a/keyboards/40percentclub/i75/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index f91b054f296..a7124adec22 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -1,19 +1,110 @@
 {
-  "keyboard_name": "i75",
-  "manufacturer": "di0ib",
-  "url": "",
-  "maintainer": "qmk",
-  "features": {
-    "bootmagic": true,
-    "command": true,
-    "console": true,
-    "extrakey": true,
-    "mousekey": true,
-    "nkro": false
-  },
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x0A0C",
-    "device_version": "1.7.5"
-  }
+    "keyboard_name": "i75",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0A0C",
+        "device_version": "1.7.5"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["ortho_5x15"],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [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},
+                {"matrix": [1, 5], "x": 14, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 7], "x": 1, "y": 1},
+                {"matrix": [1, 8], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1},
+                {"matrix": [2, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [2, 4], "x": 7, "y": 1},
+                {"matrix": [2, 5], "x": 8, "y": 1},
+                {"matrix": [2, 6], "x": 9, "y": 1},
+                {"matrix": [2, 7], "x": 10, "y": 1},
+                {"matrix": [2, 8], "x": 11, "y": 1},
+                {"matrix": [3, 0], "x": 12, "y": 1},
+                {"matrix": [3, 1], "x": 13, "y": 1},
+                {"matrix": [3, 2], "x": 14, "y": 1},
+
+                {"matrix": [3, 3], "x": 0, "y": 2},
+                {"matrix": [3, 4], "x": 1, "y": 2},
+                {"matrix": [3, 5], "x": 2, "y": 2},
+                {"matrix": [3, 6], "x": 3, "y": 2},
+                {"matrix": [3, 7], "x": 4, "y": 2},
+                {"matrix": [3, 8], "x": 5, "y": 2},
+                {"matrix": [4, 0], "x": 6, "y": 2},
+                {"matrix": [4, 1], "x": 7, "y": 2},
+                {"matrix": [4, 2], "x": 8, "y": 2},
+                {"matrix": [4, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [4, 7], "x": 13, "y": 2},
+                {"matrix": [4, 8], "x": 14, "y": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 3},
+                {"matrix": [5, 1], "x": 1, "y": 3},
+                {"matrix": [5, 2], "x": 2, "y": 3},
+                {"matrix": [5, 3], "x": 3, "y": 3},
+                {"matrix": [5, 4], "x": 4, "y": 3},
+                {"matrix": [5, 5], "x": 5, "y": 3},
+                {"matrix": [5, 6], "x": 6, "y": 3},
+                {"matrix": [5, 7], "x": 7, "y": 3},
+                {"matrix": [5, 8], "x": 8, "y": 3},
+                {"matrix": [6, 0], "x": 9, "y": 3},
+                {"matrix": [6, 1], "x": 10, "y": 3},
+                {"matrix": [6, 2], "x": 11, "y": 3},
+                {"matrix": [6, 3], "x": 12, "y": 3},
+                {"matrix": [6, 4], "x": 13, "y": 3},
+                {"matrix": [6, 5], "x": 14, "y": 3},
+
+                {"matrix": [6, 6], "x": 0, "y": 4},
+                {"matrix": [6, 7], "x": 1, "y": 4},
+                {"matrix": [6, 8], "x": 2, "y": 4},
+                {"matrix": [7, 0], "x": 3, "y": 4},
+                {"matrix": [7, 1], "x": 4, "y": 4},
+                {"matrix": [7, 2], "x": 5, "y": 4},
+                {"matrix": [7, 3], "x": 6, "y": 4},
+                {"matrix": [7, 4], "x": 7, "y": 4},
+                {"matrix": [7, 5], "x": 8, "y": 4},
+                {"matrix": [7, 6], "x": 9, "y": 4},
+                {"matrix": [7, 7], "x": 10, "y": 4},
+                {"matrix": [7, 8], "x": 11, "y": 4},
+                {"matrix": [8, 0], "x": 12, "y": 4},
+                {"matrix": [8, 1], "x": 13, "y": 4},
+                {"matrix": [8, 2], "x": 14, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/i75/promicro/keyboard.json b/keyboards/40percentclub/i75/promicro/keyboard.json
index 4c3f44469c6..933c4f8616d 100644
--- a/keyboards/40percentclub/i75/promicro/keyboard.json
+++ b/keyboards/40percentclub/i75/promicro/keyboard.json
@@ -5,91 +5,5 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["ortho_5x15"],
-    "layouts": {
-        "LAYOUT_ortho_5x15": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [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},
-                {"matrix": [1, 5], "x": 14, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 7], "x": 1, "y": 1},
-                {"matrix": [1, 8], "x": 2, "y": 1},
-                {"matrix": [2, 0], "x": 3, "y": 1},
-                {"matrix": [2, 1], "x": 4, "y": 1},
-                {"matrix": [2, 2], "x": 5, "y": 1},
-                {"matrix": [2, 3], "x": 6, "y": 1},
-                {"matrix": [2, 4], "x": 7, "y": 1},
-                {"matrix": [2, 5], "x": 8, "y": 1},
-                {"matrix": [2, 6], "x": 9, "y": 1},
-                {"matrix": [2, 7], "x": 10, "y": 1},
-                {"matrix": [2, 8], "x": 11, "y": 1},
-                {"matrix": [3, 0], "x": 12, "y": 1},
-                {"matrix": [3, 1], "x": 13, "y": 1},
-                {"matrix": [3, 2], "x": 14, "y": 1},
-
-                {"matrix": [3, 3], "x": 0, "y": 2},
-                {"matrix": [3, 4], "x": 1, "y": 2},
-                {"matrix": [3, 5], "x": 2, "y": 2},
-                {"matrix": [3, 6], "x": 3, "y": 2},
-                {"matrix": [3, 7], "x": 4, "y": 2},
-                {"matrix": [3, 8], "x": 5, "y": 2},
-                {"matrix": [4, 0], "x": 6, "y": 2},
-                {"matrix": [4, 1], "x": 7, "y": 2},
-                {"matrix": [4, 2], "x": 8, "y": 2},
-                {"matrix": [4, 3], "x": 9, "y": 2},
-                {"matrix": [4, 4], "x": 10, "y": 2},
-                {"matrix": [4, 5], "x": 11, "y": 2},
-                {"matrix": [4, 6], "x": 12, "y": 2},
-                {"matrix": [4, 7], "x": 13, "y": 2},
-                {"matrix": [4, 8], "x": 14, "y": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 3},
-                {"matrix": [5, 1], "x": 1, "y": 3},
-                {"matrix": [5, 2], "x": 2, "y": 3},
-                {"matrix": [5, 3], "x": 3, "y": 3},
-                {"matrix": [5, 4], "x": 4, "y": 3},
-                {"matrix": [5, 5], "x": 5, "y": 3},
-                {"matrix": [5, 6], "x": 6, "y": 3},
-                {"matrix": [5, 7], "x": 7, "y": 3},
-                {"matrix": [5, 8], "x": 8, "y": 3},
-                {"matrix": [6, 0], "x": 9, "y": 3},
-                {"matrix": [6, 1], "x": 10, "y": 3},
-                {"matrix": [6, 2], "x": 11, "y": 3},
-                {"matrix": [6, 3], "x": 12, "y": 3},
-                {"matrix": [6, 4], "x": 13, "y": 3},
-                {"matrix": [6, 5], "x": 14, "y": 3},
-
-                {"matrix": [6, 6], "x": 0, "y": 4},
-                {"matrix": [6, 7], "x": 1, "y": 4},
-                {"matrix": [6, 8], "x": 2, "y": 4},
-                {"matrix": [7, 0], "x": 3, "y": 4},
-                {"matrix": [7, 1], "x": 4, "y": 4},
-                {"matrix": [7, 2], "x": 5, "y": 4},
-                {"matrix": [7, 3], "x": 6, "y": 4},
-                {"matrix": [7, 4], "x": 7, "y": 4},
-                {"matrix": [7, 5], "x": 8, "y": 4},
-                {"matrix": [7, 6], "x": 9, "y": 4},
-                {"matrix": [7, 7], "x": 10, "y": 4},
-                {"matrix": [7, 8], "x": 11, "y": 4},
-                {"matrix": [8, 0], "x": 12, "y": 4},
-                {"matrix": [8, 1], "x": 13, "y": 4},
-                {"matrix": [8, 2], "x": 14, "y": 4}
-            ]
-        }
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/40percentclub/i75/teensy2/keyboard.json b/keyboards/40percentclub/i75/teensy2/keyboard.json
index cc441a10961..2296a578289 100644
--- a/keyboards/40percentclub/i75/teensy2/keyboard.json
+++ b/keyboards/40percentclub/i75/teensy2/keyboard.json
@@ -5,91 +5,5 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay",
-    "community_layouts": ["ortho_5x15"],
-    "layouts": {
-        "LAYOUT_ortho_5x15": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [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},
-                {"matrix": [1, 5], "x": 14, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 7], "x": 1, "y": 1},
-                {"matrix": [1, 8], "x": 2, "y": 1},
-                {"matrix": [2, 0], "x": 3, "y": 1},
-                {"matrix": [2, 1], "x": 4, "y": 1},
-                {"matrix": [2, 2], "x": 5, "y": 1},
-                {"matrix": [2, 3], "x": 6, "y": 1},
-                {"matrix": [2, 4], "x": 7, "y": 1},
-                {"matrix": [2, 5], "x": 8, "y": 1},
-                {"matrix": [2, 6], "x": 9, "y": 1},
-                {"matrix": [2, 7], "x": 10, "y": 1},
-                {"matrix": [2, 8], "x": 11, "y": 1},
-                {"matrix": [3, 0], "x": 12, "y": 1},
-                {"matrix": [3, 1], "x": 13, "y": 1},
-                {"matrix": [3, 2], "x": 14, "y": 1},
-
-                {"matrix": [3, 3], "x": 0, "y": 2},
-                {"matrix": [3, 4], "x": 1, "y": 2},
-                {"matrix": [3, 5], "x": 2, "y": 2},
-                {"matrix": [3, 6], "x": 3, "y": 2},
-                {"matrix": [3, 7], "x": 4, "y": 2},
-                {"matrix": [3, 8], "x": 5, "y": 2},
-                {"matrix": [4, 0], "x": 6, "y": 2},
-                {"matrix": [4, 1], "x": 7, "y": 2},
-                {"matrix": [4, 2], "x": 8, "y": 2},
-                {"matrix": [4, 3], "x": 9, "y": 2},
-                {"matrix": [4, 4], "x": 10, "y": 2},
-                {"matrix": [4, 5], "x": 11, "y": 2},
-                {"matrix": [4, 6], "x": 12, "y": 2},
-                {"matrix": [4, 7], "x": 13, "y": 2},
-                {"matrix": [4, 8], "x": 14, "y": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 3},
-                {"matrix": [5, 1], "x": 1, "y": 3},
-                {"matrix": [5, 2], "x": 2, "y": 3},
-                {"matrix": [5, 3], "x": 3, "y": 3},
-                {"matrix": [5, 4], "x": 4, "y": 3},
-                {"matrix": [5, 5], "x": 5, "y": 3},
-                {"matrix": [5, 6], "x": 6, "y": 3},
-                {"matrix": [5, 7], "x": 7, "y": 3},
-                {"matrix": [5, 8], "x": 8, "y": 3},
-                {"matrix": [6, 0], "x": 9, "y": 3},
-                {"matrix": [6, 1], "x": 10, "y": 3},
-                {"matrix": [6, 2], "x": 11, "y": 3},
-                {"matrix": [6, 3], "x": 12, "y": 3},
-                {"matrix": [6, 4], "x": 13, "y": 3},
-                {"matrix": [6, 5], "x": 14, "y": 3},
-
-                {"matrix": [6, 6], "x": 0, "y": 4},
-                {"matrix": [6, 7], "x": 1, "y": 4},
-                {"matrix": [6, 8], "x": 2, "y": 4},
-                {"matrix": [7, 0], "x": 3, "y": 4},
-                {"matrix": [7, 1], "x": 4, "y": 4},
-                {"matrix": [7, 2], "x": 5, "y": 4},
-                {"matrix": [7, 3], "x": 6, "y": 4},
-                {"matrix": [7, 4], "x": 7, "y": 4},
-                {"matrix": [7, 5], "x": 8, "y": 4},
-                {"matrix": [7, 6], "x": 9, "y": 4},
-                {"matrix": [7, 7], "x": 10, "y": 4},
-                {"matrix": [7, 8], "x": 11, "y": 4},
-                {"matrix": [8, 0], "x": 12, "y": 4},
-                {"matrix": [8, 1], "x": 13, "y": 4},
-                {"matrix": [8, 2], "x": 14, "y": 4}
-            ]
-        }
-    }
+    "bootloader": "halfkay"
 }
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/40percentclub/luddite/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/40percentclub/luddite/keyboard.json b/keyboards/40percentclub/luddite/keyboard.json
index 8a0b5d5913b..a9f79d73695 100644
--- a/keyboards/40percentclub/luddite/keyboard.json
+++ b/keyboards/40percentclub/luddite/keyboard.json
@@ -18,6 +18,12 @@
     "nkro": true,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
     "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/40percentclub/mf68/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/mf68/keyboard.json b/keyboards/40percentclub/mf68/keyboard.json
index 47259ac23f9..45585d5e479 100644
--- a/keyboards/40percentclub/mf68/keyboard.json
+++ b/keyboards/40percentclub/mf68/keyboard.json
@@ -17,6 +17,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
     "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
deleted file mode 100644
index c30966d9d2f..00000000000
--- a/keyboards/40percentclub/nein/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/nein/keyboard.json b/keyboards/40percentclub/nein/keyboard.json
index 53a3a7639b8..9e1711f71e7 100644
--- a/keyboards/40percentclub/nein/keyboard.json
+++ b/keyboards/40percentclub/nein/keyboard.json
@@ -18,6 +18,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "direct": [
       ["F4", "F5", "F6"],
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
deleted file mode 100644
index 0fe9b9df213..00000000000
--- a/keyboards/40percentclub/nori/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
deleted file mode 100644
index 214d1da2a09..00000000000
--- a/keyboards/40percentclub/nori/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "keyboard_name": "The nori Keyboard",
-    "manufacturer": "di0ib",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0x4025",
-      "pid": "0x0A0C",
-      "device_version": "4.4.4"
-    },
-    "matrix_pins": {
-      "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"],
-      "rows": ["D3", "D2", "D1", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-      "pin": "B5"
-    },
-    "rgblight": {
-      "saturation_steps": 8,
-      "brightness_steps": 8,
-      "led_count": 10,
-      "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": ["ortho_4x4", "ortho_4x12"],
-    "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_ortho_4x8": {
-          "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": 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": [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": [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}
-          ]
-      },
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-              {"matrix": [0, 0], "x": 0, "y": 0},
-              {"matrix": [0, 1], "x": 1, "y": 0},
-              {"matrix": [0, 2], "x": 2, "y": 0},
-              {"matrix": [0, 3], "x": 3, "y": 0},
-              {"matrix": [0, 4], "x": 4, "y": 0},
-              {"matrix": [0, 5], "x": 5, "y": 0},
-              {"matrix": [0, 6], "x": 6, "y": 0},
-              {"matrix": [0, 7], "x": 7, "y": 0},
-              {"matrix": [0, 8], "x": 8, "y": 0},
-              {"matrix": [0, 9], "x": 9, "y": 0},
-              {"matrix": [0, 10], "x": 10, "y": 0},
-              {"matrix": [0, 11], "x": 11, "y": 0},
-
-              {"matrix": [1, 0], "x": 0, "y": 1},
-              {"matrix": [1, 1], "x": 1, "y": 1},
-              {"matrix": [1, 2], "x": 2, "y": 1},
-              {"matrix": [1, 3], "x": 3, "y": 1},
-              {"matrix": [1, 4], "x": 4, "y": 1},
-              {"matrix": [1, 5], "x": 5, "y": 1},
-              {"matrix": [1, 6], "x": 6, "y": 1},
-              {"matrix": [1, 7], "x": 7, "y": 1},
-              {"matrix": [1, 8], "x": 8, "y": 1},
-              {"matrix": [1, 9], "x": 9, "y": 1},
-              {"matrix": [1, 10], "x": 10, "y": 1},
-              {"matrix": [1, 11], "x": 11, "y": 1},
-
-              {"matrix": [2, 0], "x": 0, "y": 2},
-              {"matrix": [2, 1], "x": 1, "y": 2},
-              {"matrix": [2, 2], "x": 2, "y": 2},
-              {"matrix": [2, 3], "x": 3, "y": 2},
-              {"matrix": [2, 4], "x": 4, "y": 2},
-              {"matrix": [2, 5], "x": 5, "y": 2},
-              {"matrix": [2, 6], "x": 6, "y": 2},
-              {"matrix": [2, 7], "x": 7, "y": 2},
-              {"matrix": [2, 8], "x": 8, "y": 2},
-              {"matrix": [2, 9], "x": 9, "y": 2},
-              {"matrix": [2, 10], "x": 10, "y": 2},
-              {"matrix": [2, 11], "x": 11, "y": 2},
-
-              {"matrix": [3, 0], "x": 0, "y": 3},
-              {"matrix": [3, 1], "x": 1, "y": 3},
-              {"matrix": [3, 2], "x": 2, "y": 3},
-              {"matrix": [3, 3], "x": 3, "y": 3},
-              {"matrix": [3, 4], "x": 4, "y": 3},
-              {"matrix": [3, 5], "x": 5, "y": 3},
-              {"matrix": [3, 6], "x": 6, "y": 3},
-              {"matrix": [3, 7], "x": 7, "y": 3},
-              {"matrix": [3, 8], "x": 8, "y": 3},
-              {"matrix": [3, 9], "x": 9, "y": 3},
-              {"matrix": [3, 10], "x": 10, "y": 3},
-              {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/40percentclub/nori/keyboard.json b/keyboards/40percentclub/nori/keyboard.json
new file mode 100644
index 00000000000..968e74e19e1
--- /dev/null
+++ b/keyboards/40percentclub/nori/keyboard.json
@@ -0,0 +1,176 @@
+{
+    "keyboard_name": "The nori Keyboard",
+    "manufacturer": "di0ib",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0x4025",
+      "pid": "0x0A0C",
+      "device_version": "4.4.4"
+    },
+    "matrix_pins": {
+      "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"],
+      "rows": ["D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+      "bootmagic": true,
+      "mousekey": true,
+      "extrakey": true,
+      "command": true,
+      "nkro": true,
+      "backlight": true,
+      "rgblight": true
+    },
+    "qmk": {
+      "locking": {
+        "enabled": true,
+        "resync": true
+      }
+    },
+    "backlight": {
+      "pin": "B5"
+    },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 10,
+      "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": ["ortho_4x4", "ortho_4x12"],
+    "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_ortho_4x8": {
+          "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": 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": [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": [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}
+          ]
+      },
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0},
+              {"matrix": [0, 6], "x": 6, "y": 0},
+              {"matrix": [0, 7], "x": 7, "y": 0},
+              {"matrix": [0, 8], "x": 8, "y": 0},
+              {"matrix": [0, 9], "x": 9, "y": 0},
+              {"matrix": [0, 10], "x": 10, "y": 0},
+              {"matrix": [0, 11], "x": 11, "y": 0},
+
+              {"matrix": [1, 0], "x": 0, "y": 1},
+              {"matrix": [1, 1], "x": 1, "y": 1},
+              {"matrix": [1, 2], "x": 2, "y": 1},
+              {"matrix": [1, 3], "x": 3, "y": 1},
+              {"matrix": [1, 4], "x": 4, "y": 1},
+              {"matrix": [1, 5], "x": 5, "y": 1},
+              {"matrix": [1, 6], "x": 6, "y": 1},
+              {"matrix": [1, 7], "x": 7, "y": 1},
+              {"matrix": [1, 8], "x": 8, "y": 1},
+              {"matrix": [1, 9], "x": 9, "y": 1},
+              {"matrix": [1, 10], "x": 10, "y": 1},
+              {"matrix": [1, 11], "x": 11, "y": 1},
+
+              {"matrix": [2, 0], "x": 0, "y": 2},
+              {"matrix": [2, 1], "x": 1, "y": 2},
+              {"matrix": [2, 2], "x": 2, "y": 2},
+              {"matrix": [2, 3], "x": 3, "y": 2},
+              {"matrix": [2, 4], "x": 4, "y": 2},
+              {"matrix": [2, 5], "x": 5, "y": 2},
+              {"matrix": [2, 6], "x": 6, "y": 2},
+              {"matrix": [2, 7], "x": 7, "y": 2},
+              {"matrix": [2, 8], "x": 8, "y": 2},
+              {"matrix": [2, 9], "x": 9, "y": 2},
+              {"matrix": [2, 10], "x": 10, "y": 2},
+              {"matrix": [2, 11], "x": 11, "y": 2},
+
+              {"matrix": [3, 0], "x": 0, "y": 3},
+              {"matrix": [3, 1], "x": 1, "y": 3},
+              {"matrix": [3, 2], "x": 2, "y": 3},
+              {"matrix": [3, 3], "x": 3, "y": 3},
+              {"matrix": [3, 4], "x": 4, "y": 3},
+              {"matrix": [3, 5], "x": 5, "y": 3},
+              {"matrix": [3, 6], "x": 6, "y": 3},
+              {"matrix": [3, 7], "x": 7, "y": 3},
+              {"matrix": [3, 8], "x": 8, "y": 3},
+              {"matrix": [3, 9], "x": 9, "y": 3},
+              {"matrix": [3, 10], "x": 10, "y": 3},
+              {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/40percentclub/nori/rules.mk b/keyboards/40percentclub/nori/rules.mk
index 926fffda128..271780b75ec 100644
--- a/keyboards/40percentclub/nori/rules.mk
+++ b/keyboards/40percentclub/nori/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
deleted file mode 100644
index e3cac2cbfac..00000000000
--- a/keyboards/40percentclub/polyandry/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-//more detailed config options start below:
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index b04b0500450..49b8bedbe32 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -11,9 +11,36 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "usb": {
         "vid": "0x4025",
         "pid": "0x6060",
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "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": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 0, "y": 3},
+                {"matrix": [0, 10], "x": 1, "y": 3},
+                {"matrix": [0, 11], "x": 2, "y": 3}
+            ]
+        }
     }
 }
diff --git a/keyboards/40percentclub/polyandry/promicro/keyboard.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json
index 8a8cd987942..a8169c93dd6 100644
--- a/keyboards/40percentclub/polyandry/promicro/keyboard.json
+++ b/keyboards/40percentclub/polyandry/promicro/keyboard.json
@@ -5,26 +5,5 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "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": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1},
-
-                {"matrix": [0, 6], "x": 0, "y": 2},
-                {"matrix": [0, 7], "x": 1, "y": 2},
-                {"matrix": [0, 8], "x": 2, "y": 2},
-
-                {"matrix": [0, 9], "x": 0, "y": 3},
-                {"matrix": [0, 10], "x": 1, "y": 3},
-                {"matrix": [0, 11], "x": 2, "y": 3}
-            ]
-        }
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/40percentclub/polyandry/teensy2/keyboard.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json
index 33fd1d71dfe..0a870332b2b 100644
--- a/keyboards/40percentclub/polyandry/teensy2/keyboard.json
+++ b/keyboards/40percentclub/polyandry/teensy2/keyboard.json
@@ -5,26 +5,5 @@
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay",
-    "layouts": {
-        "LAYOUT_ortho_4x3": {
-            "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": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1},
-
-                {"matrix": [0, 6], "x": 0, "y": 2},
-                {"matrix": [0, 7], "x": 1, "y": 2},
-                {"matrix": [0, 8], "x": 2, "y": 2},
-
-                {"matrix": [0, 9], "x": 0, "y": 3},
-                {"matrix": [0, 10], "x": 1, "y": 3},
-                {"matrix": [0, 11], "x": 2, "y": 3}
-            ]
-        }
-    }
+    "bootloader": "halfkay"
 }
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
deleted file mode 100644
index b46d357dd04..00000000000
--- a/keyboards/40percentclub/tomato/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* eliminate lag on space cadet mods */
-#define PERMISSIVE_HOLD
diff --git a/keyboards/40percentclub/tomato/keyboard.json b/keyboards/40percentclub/tomato/keyboard.json
index a44946d3725..c0b526cbc6b 100644
--- a/keyboards/40percentclub/tomato/keyboard.json
+++ b/keyboards/40percentclub/tomato/keyboard.json
@@ -37,6 +37,15 @@
     "nkro": true,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": false,
+      "resync": true
+    }
+  },
+  "tapping": {
+    "permissive_hold": true
+  },
   "matrix_pins": {
     "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
     "rows": ["F7", "B1", "B3", "B2", "B6"]
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 8f5756d1506..f0182a59f81 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -28,10 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Enable GNAP matrix serial output */
 #define GNAP_ENABLE
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
deleted file mode 100644
index 668f277f404..00000000000
--- a/keyboards/40percentclub/ut47/info.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "keyboard_name": "ut47",
-  "manufacturer": "40percent.club",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4025",
-    "pid": "0x7574",
-    "device_version": "0.0.1"
-  },
-  "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, "w": 1.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-        {"matrix": [1, 1], "x": 1.25, "y": 1},
-        {"matrix": [1, 2], "x": 2.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.25},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.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, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
-        {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/40percentclub/ut47/keyboard.json b/keyboards/40percentclub/ut47/keyboard.json
new file mode 100644
index 00000000000..62e4a940a18
--- /dev/null
+++ b/keyboards/40percentclub/ut47/keyboard.json
@@ -0,0 +1,82 @@
+{
+  "keyboard_name": "ut47",
+  "manufacturer": "40percent.club",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x7574",
+    "device_version": "0.0.1"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "nkro": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.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.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.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, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
index 6ba6aa5f6fa..5480f61b9b4 100644
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-# custom matrix setup
 CUSTOM_MATRIX = yes
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
deleted file mode 100644
index 1d951890cd1..00000000000
--- a/keyboards/45_ats/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* 
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-  
- This program is free software: you can redistribute it and/or modify 
- it under the terms of the GNU General Public License as published by 
- the Free Software Foundation, either version 2 of the License, or 
- (at your option) any later version. 
-  
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- GNU General Public License for more details. 
-  
- You should have received a copy of the GNU General Public License 
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/45_ats/keyboard.json b/keyboards/45_ats/keyboard.json
index 7c873f21ede..5e5465f2643 100644
--- a/keyboards/45_ats/keyboard.json
+++ b/keyboards/45_ats/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
       "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "F6", "F5", "F4", "C7", "F7", "C6", "B6", "D4"],
       "rows": ["D3", "D5", "D7", "D6"]
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
deleted file mode 100644
index b5ad58bc11d..00000000000
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "keyboard_name": "AEKISO60 Rev B",
-    "usb": {
-        "pid": "0x0011",
-        "device_version": "0.0.2"
-    },
-    "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": "A8"
-    },
-    "matrix_pins": {
-        "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"],
-        "rows": ["B15", "A9", "B7", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A10"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/4pplet/aekiso60/rev_b/keyboard.json b/keyboards/4pplet/aekiso60/rev_b/keyboard.json
new file mode 100644
index 00000000000..2bbf1851253
--- /dev/null
+++ b/keyboards/4pplet/aekiso60/rev_b/keyboard.json
@@ -0,0 +1,44 @@
+{
+    "keyboard_name": "AEKISO60 Rev B",
+    "usb": {
+        "pid": "0x0011",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "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": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B15", "A9", "B7", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A10"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk
index e539634d589..04fe1eba2ac 100644
--- a/keyboards/4pplet/aekiso60/rev_b/rules.mk
+++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 350b9abad7f..80a093147eb 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -25,11 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PIN A5
 #define WS2812_SPI_SCK_PAL_MODE 0
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Indicator leds */
 #define LOCK_LIGHTS     TRUE
 #define DISPLAY_LAYERS  TRUE
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
deleted file mode 100644
index baafb58153b..00000000000
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ /dev/null
@@ -1,760 +0,0 @@
-{
-    "keyboard_name": "Eagle Viper REP Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/eagle_viper_rep",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0007",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"],
-        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
-    },
-    "diode_direction": "COL2ROW",
-    "dynamic_keymap": {
-        "layer_count": 5
-    },
-    "backlight": {
-        "pin": "A3",
-        "levels": 10,
-        "breathing": true
-    },
-    "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": "A7",
-        "driver": "spi"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Alt", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
new file mode 100644
index 00000000000..18d8ba5d8aa
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/keyboard.json
@@ -0,0 +1,776 @@
+{
+    "keyboard_name": "Eagle Viper REP Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/eagle_viper_rep",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0007",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"],
+        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "backlight": {
+        "pin": "A3",
+        "levels": 10,
+        "breathing": true
+    },
+    "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": "A7",
+        "driver": "spi"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Alt", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "\"", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "\u00a3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "@", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index 30a36865b96..04fe1eba2ac 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes   # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = yes    # Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index b5957e6f30c..73182129a57 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Underglow */
 #define WS2812_EXTERNAL_PULLUP
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Indicator leds */
 #define LAYER_1             B14
 #define LAYER_2             B15
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
deleted file mode 100644
index 2ebb2606869..00000000000
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ /dev/null
@@ -1,769 +0,0 @@
-{
-    "keyboard_name": "Eagle Viper REP Rev B",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/eagle_viper_rep",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0010",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"],
-        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
-    },
-    "diode_direction": "COL2ROW",
-    "dynamic_keymap": {
-        "layer_count": 5
-    },
-    "backlight": {
-        "pin": "A6",
-        "levels": 6,
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B1",
-        "num_lock": "B12",
-        "scroll_lock": "B13"
-    },
-    "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": "A8"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-                                            
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-                                            
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
-                                            
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-                                            
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 2], "x": 3.75, "y": 4, "w": 2.25},
-                {"label": "Space", "matrix": [9, 3], "x": 6, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Alt", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
-                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
-                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
-                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
-                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
-                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
new file mode 100644
index 00000000000..e0356d5dad5
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/keyboard.json
@@ -0,0 +1,784 @@
+{
+    "keyboard_name": "Eagle Viper REP Rev B",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/eagle_viper_rep",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0010",
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"],
+        "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 6,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B12",
+        "scroll_lock": "B13"
+    },
+    "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": "A8"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+                                            
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+                                            
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
+                                            
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+                                            
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 2], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [9, 3], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Alt", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "`", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [4, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
index 428a48c4649..04fe1eba2ac 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes   # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = no    # Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json
deleted file mode 100644
index d64779bec3f..00000000000
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ /dev/null
@@ -1,729 +0,0 @@
-{
-    "keyboard_name": "Steezy60 Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/steezy60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "C2",
-        "esc_output": "C4"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-       "60_ansi",
-       "60_ansi_split_bs_rshift",
-       "60_ansi_tsangan",
-       "60_hhkb",
-       "60_iso",
-       "60_iso_split_bs_rshift",
-       "60_iso_tsangan",
-       "60_tsangan_hhkb"
-    ],
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
-        "rows": ["C2", "D0", "B0", "C7", "C5"]
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "rgblight": {
-        "led_count": 12,
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "NUBS", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12, "y": 3},
-                {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "None", "matrix": [4, 2], "x": 2, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
-                {"label": "LSpace", "matrix": [4, 4], "w": 2.5, "x": 4, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4},
-                {"label": "RSpace", "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
-                {"label": "None", "matrix": [4, 9], "x": 12, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "x": 13, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_canon": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "nuhs", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [4, 12], "w": 1.25, "h": 2, "x": 13.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.5, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "Win", "matrix": [4, 2], "x": 2, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
-                {"label": "Menu", "matrix": [4, 9], "x": 12, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/steezy60/rev_a/keyboard.json b/keyboards/4pplet/steezy60/rev_a/keyboard.json
new file mode 100644
index 00000000000..ffd44642230
--- /dev/null
+++ b/keyboards/4pplet/steezy60/rev_a/keyboard.json
@@ -0,0 +1,730 @@
+{
+    "keyboard_name": "Steezy60 Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/steezy60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "C2",
+        "esc_output": "C4"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "community_layouts": [
+       "60_ansi",
+       "60_ansi_split_bs_rshift",
+       "60_ansi_tsangan",
+       "60_hhkb",
+       "60_iso",
+       "60_iso_split_bs_rshift",
+       "60_iso_tsangan",
+       "60_tsangan_hhkb"
+    ],
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
+        "rows": ["C2", "D0", "B0", "C7", "C5"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "key_lock": true
+    },
+    "rgblight": {
+        "led_count": 12,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "NUBS", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12, "y": 3},
+                {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "None", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "LSpace", "matrix": [4, 4], "w": 2.5, "x": 4, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4},
+                {"label": "RSpace", "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
+                {"label": "None", "matrix": [4, 9], "x": 12, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "x": 13, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_canon": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "nuhs", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [4, 12], "w": 1.25, "h": 2, "x": 13.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.5, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Win", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
+                {"label": "Menu", "matrix": [4, 9], "x": 12, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk
deleted file mode 100644
index 96c9ff2cbbe..00000000000
--- a/keyboards/4pplet/steezy60/rev_a/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json
deleted file mode 100644
index e087ff8d1bb..00000000000
--- a/keyboards/4pplet/steezy60/rev_b/info.json
+++ /dev/null
@@ -1,725 +0,0 @@
-{
-    "keyboard_name": "Steezy60 Rev B",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/steezy60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0013",
-        "device_version": "0.0.2"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-       "60_ansi",
-       "60_ansi_split_bs_rshift",
-       "60_ansi_tsangan",
-       "60_hhkb",
-       "60_iso",
-       "60_iso_split_bs_rshift",
-       "60_iso_tsangan",
-       "60_tsangan_hhkb"
-    ],
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["A7", "A5", "A4", "A3", "A1", "F1", "F0", "C15", "C14", "B9", "B6", "B5", "B4", "B3"],
-        "rows": ["B8", "A15", "C13", "A2", "A6"]
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "rgblight": {
-        "led_count": 12,
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A8"
-    },
-    "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "NUBS", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12, "y": 3},
-                {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "None", "matrix": [4, 2], "x": 2, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
-                {"label": "LSpace", "matrix": [4, 4], "w": 2.5, "x": 4, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4},
-                {"label": "RSpace", "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
-                {"label": "None", "matrix": [4, 9], "x": 12, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "x": 13, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
-                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
-                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_canon": {
-            "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": [4, 13], "x": 14, "y": 0},
-                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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": "nuhs", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [4, 12], "w": 1.25, "h": 2, "x": 13.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.5, "x": 12.25, "y": 3},
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "Win", "matrix": [4, 2], "x": 2, "y": 4},
-                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
-                {"label": "Space", "matrix": [4, 5], "w": 6, "x": 4, "y": 4},
-                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
-                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
-                {"label": "Menu", "matrix": [4, 9], "x": 12, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4},
-                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/steezy60/rev_b/keyboard.json b/keyboards/4pplet/steezy60/rev_b/keyboard.json
new file mode 100644
index 00000000000..8ff41bd1561
--- /dev/null
+++ b/keyboards/4pplet/steezy60/rev_b/keyboard.json
@@ -0,0 +1,726 @@
+{
+    "keyboard_name": "Steezy60 Rev B",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/steezy60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0013",
+        "device_version": "0.0.2"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+       "60_ansi",
+       "60_ansi_split_bs_rshift",
+       "60_ansi_tsangan",
+       "60_hhkb",
+       "60_iso",
+       "60_iso_split_bs_rshift",
+       "60_iso_tsangan",
+       "60_tsangan_hhkb"
+    ],
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A7", "A5", "A4", "A3", "A1", "F1", "F0", "C15", "C14", "B9", "B6", "B5", "B4", "B3"],
+        "rows": ["B8", "A15", "C13", "A2", "A6"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "key_lock": true
+    },
+    "rgblight": {
+        "led_count": 12,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "NUBS", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12, "y": 3},
+                {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "None", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "LSpace", "matrix": [4, 4], "w": 2.5, "x": 4, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4},
+                {"label": "RSpace", "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
+                {"label": "None", "matrix": [4, 9], "x": 12, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "x": 13, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "w": 1.25, "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Menu", "matrix": [4, 10], "w": 1.25, "x": 12.5, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": "Backspace", "matrix": [4, 13], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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": "Enter", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "NUHS", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "NUBS", "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, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.75, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 12], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 7, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 11, "y": 4},
+                {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_canon": {
+            "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": [4, 13], "x": 14, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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": "nuhs", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [4, 12], "w": 1.25, "h": 2, "x": 13.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "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, 13], "w": 1.5, "x": 12.25, "y": 3},
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Win", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "Alt", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "Space", "matrix": [4, 5], "w": 6, "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 7], "x": 10, "y": 4},
+                {"label": "Win", "matrix": [4, 8], "x": 11, "y": 4},
+                {"label": "Menu", "matrix": [4, 9], "x": 12, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4},
+                {"label": "Fn", "matrix": [4, 11], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/steezy60/rev_b/rules.mk b/keyboards/4pplet/steezy60/rev_b/rules.mk
index 3787d8c241b..04fe1eba2ac 100644
--- a/keyboards/4pplet/steezy60/rev_b/rules.mk
+++ b/keyboards/4pplet/steezy60/rev_b/rules.mk
@@ -1,8 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
deleted file mode 100644
index 5aba94b50ab..00000000000
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-    "keyboard_name": "Unextended Standard Rev A",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/Unextended",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x0012",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "matrix_pins": {
-        "rows": ["B14", "B15", "B6", "B5", "B4"],
-        "cols": ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": false,
-        "command": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "ws2812": {
-        "pin": "A8"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "indicators": {
-        "caps_lock": "A10",
-        "on_state": 0
-    },
-    "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1},
-                {"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": "nubs", "matrix": [3, 13], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 0.75},
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "nubs", "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.25},
-                 {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
-                 {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
-                 {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
-                 {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
-                 {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
-                 {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
-                 {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
-                 {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
-                 {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
-                 {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
-                 {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_m0116": {
-            "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
-                {"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": "Enter", "matrix": [2, 13], "x": 13.5, "y": 1, "h": 2},
-                {"label": "Control", "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": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
-                {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
-                {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
-                {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
-                {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
-            ]
-        },
-        "LAYOUT_m0118": {
-            "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
-                {"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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 0.75, "h": 2},
-                {"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": "nuhs", "matrix": [3, 13], "x": 12.75, "y": 2},
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "nubs", "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.25},
-                {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "Opt", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.5},
-                {"label": "Cmd", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.75},
-                {"label": "Space", "matrix": [4, 6], "x": 4.5, "y": 4, "w": 5.25},
-                {"label": "Cmd", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.75},
-                {"label": "\u2190", "matrix": [4, 10], "x": 11.5, "y": 4},
-                {"label": "\u2192", "matrix": [4, 11], "x": 12.5, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 13.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/unextended_std/rev_a/keyboard.json b/keyboards/4pplet/unextended_std/rev_a/keyboard.json
new file mode 100644
index 00000000000..1b1909854ac
--- /dev/null
+++ b/keyboards/4pplet/unextended_std/rev_a/keyboard.json
@@ -0,0 +1,255 @@
+{
+    "keyboard_name": "Unextended Standard Rev A",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/Unextended",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x0012",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "rows": ["B14", "B15", "B6", "B5", "B4"],
+        "cols": ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgblight": true,
+        "key_lock": true
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "A10",
+        "on_state": 0
+    },
+    "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1},
+                {"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": "nubs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 0.75},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "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.25},
+                 {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                 {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                 {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                 {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                 {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                 {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                 {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                 {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                 {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                 {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                 {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_m0116": {
+            "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"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": "Enter", "matrix": [2, 13], "x": 13.5, "y": 1, "h": 2},
+                {"label": "Control", "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": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
+            ]
+        },
+        "LAYOUT_m0118": {
+            "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": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"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": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 0.75, "h": 2},
+                {"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": "nuhs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "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.25},
+                {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Opt", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Cmd", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 6], "x": 4.5, "y": 4, "w": 5.25},
+                {"label": "Cmd", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.75},
+                {"label": "\u2190", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/unextended_std/rev_a/rules.mk b/keyboards/4pplet/unextended_std/rev_a/rules.mk
index 3787d8c241b..04fe1eba2ac 100644
--- a/keyboards/4pplet/unextended_std/rev_a/rules.mk
+++ b/keyboards/4pplet/unextended_std/rev_a/rules.mk
@@ -1,8 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-KEY_LOCK_ENABLE = yes
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
deleted file mode 100644
index 692f9956052..00000000000
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "waffling60 Rev D",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x000E",
-        "device_version": "0.0.4"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 1
-    },
-    "ws2812": {
-        "pin": "A8"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
-        "rows": ["B14", "A9", "B6", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [4, 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, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_d/keyboard.json b/keyboards/4pplet/waffling60/rev_d/keyboard.json
new file mode 100644
index 00000000000..90f049ee293
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d/keyboard.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "waffling60 Rev D",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000E",
+        "device_version": "0.0.4"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 1
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [4, 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, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk
index e539634d589..04fe1eba2ac 100644
--- a/keyboards/4pplet/waffling60/rev_d/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
deleted file mode 100644
index 3969d98c424..00000000000
--- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Waffling60 Rev D ANSI",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x000D",
-        "device_version": "0.0.4"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
-        "rows": ["B14", "A9", "B6", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-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": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
-                {"matrix": [4, 6], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
new file mode 100644
index 00000000000..f471d27e14b
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/keyboard.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "Waffling60 Rev D ANSI",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000D",
+        "device_version": "0.0.4"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [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": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
index a64bf928ebb..04fe1eba2ac 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
deleted file mode 100644
index fdcf9d0bdee..00000000000
--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
+++ /dev/null
@@ -1,374 +0,0 @@
-{
-    "keyboard_name": "Waffling60 Rev D ISO",
-    "manufacturer": "4pplet",
-    "url": "https://github.com/4pplet/waffling60",
-    "maintainer": "4pplet",
-    "usb": {
-        "vid": "0x4444",
-        "pid": "0x000C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
-        "rows": ["B14", "A9", "B6", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "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": [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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
-                {"matrix": [4, 6], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_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": [1, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_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": [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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_wkl_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": [1, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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.5},
-                {"matrix": [4, 2], "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": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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.5},
-                {"matrix": [4, 2], "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": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
new file mode 100644
index 00000000000..757de46e6b9
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keyboard.json
@@ -0,0 +1,379 @@
+{
+    "keyboard_name": "Waffling60 Rev D ISO",
+    "manufacturer": "4pplet",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "usb": {
+        "vid": "0x4444",
+        "pid": "0x000C",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+        "rows": ["B14", "A9", "B6", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "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": [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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_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": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_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": [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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_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": [1, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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.5},
+                {"matrix": [4, 2], "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": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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.5},
+                {"matrix": [4, 2], "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": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
index e11c916b4fd..04fe1eba2ac 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk
@@ -1,16 +1,2 @@
-# 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
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/waffling60/rev_e/info.json b/keyboards/4pplet/waffling60/rev_e/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e/info.json
rename to keyboards/4pplet/waffling60/rev_e/keyboard.json
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e_ansi/info.json
rename to keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/info.json b/keyboards/4pplet/waffling60/rev_e_iso/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e_iso/info.json
rename to keyboards/4pplet/waffling60/rev_e_iso/keyboard.json
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
deleted file mode 100644
index 47d3d5d662f..00000000000
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "keyboard_name": "waffling80 Rev B",
-    "usb": {
-        "pid": "0x000F",
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 2
-    },
-    "ws2812": {
-        "pin": "A8"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"],
-        "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/4pplet/waffling80/rev_b/keyboard.json b/keyboards/4pplet/waffling80/rev_b/keyboard.json
new file mode 100644
index 00000000000..2c33caa4044
--- /dev/null
+++ b/keyboards/4pplet/waffling80/rev_b/keyboard.json
@@ -0,0 +1,29 @@
+{
+    "keyboard_name": "waffling80 Rev B",
+    "usb": {
+        "pid": "0x000F",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 2
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"],
+        "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk
index e539634d589..04fe1eba2ac 100644
--- a/keyboards/4pplet/waffling80/rev_b/rules.mk
+++ b/keyboards/4pplet/waffling80/rev_b/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index b9a17d41287..e69de29bb2d 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -1,22 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/4pplet/yakiimo/rev_a/keyboard.json b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
index ec5addd8501..f22f67ac6a4 100644
--- a/keyboards/4pplet/yakiimo/rev_a/keyboard.json
+++ b/keyboards/4pplet/yakiimo/rev_a/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": 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"]
diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/8pack/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json
index cf55db98153..84d81c11d39 100644
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -7,6 +7,12 @@
     "vid": "0xFEED",
     "pid": "0x2171"
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "backlight": {
     "driver": "timer",
     "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
deleted file mode 100644
index 84e1acbb3c7..00000000000
--- a/keyboards/abacus/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 nickolaij
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/abacus/keyboard.json b/keyboards/abacus/keyboard.json
index c34fb32c52f..9622089bbfb 100644
--- a/keyboards/abacus/keyboard.json
+++ b/keyboards/abacus/keyboard.json
@@ -22,6 +22,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
         "rows": ["D3", "D2", "D4", "C6"]
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
deleted file mode 100644
index 81349657efa..00000000000
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 AbstractKB
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/abstract/ellipse/rev1/keyboard.json b/keyboards/abstract/ellipse/rev1/keyboard.json
index 31a17301a7a..8e38f29d56c 100644
--- a/keyboards/abstract/ellipse/rev1/keyboard.json
+++ b/keyboards/abstract/ellipse/rev1/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "B6", "B5"],
         "rows": ["D3", "C7"]
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
deleted file mode 100644
index 2bcc184a309..00000000000
--- a/keyboards/acekeyboard/titan60/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/acekeyboard/titan60/keyboard.json b/keyboards/acekeyboard/titan60/keyboard.json
index 3111e1e9d7f..4446927ab8a 100644
--- a/keyboards/acekeyboard/titan60/keyboard.json
+++ b/keyboards/acekeyboard/titan60/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
       "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
       "rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 17c09f0f576..cda883bd631 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87h/delta/keyboard.json b/keyboards/acheron/apollo/87h/delta/keyboard.json
index c2d5e206923..5d01c1b8f77 100644
--- a/keyboards/acheron/apollo/87h/delta/keyboard.json
+++ b/keyboards/acheron/apollo/87h/delta/keyboard.json
@@ -68,6 +68,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 42b27d55ba9..8870c3c9c99 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 // RGB Matrix defines
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json
deleted file mode 100644
index 150f838c89b..00000000000
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
-    "keyboard_name": "Apollo87H rev. Gamma",
-    "usb": {
-        "pid": "0x8774",
-        "device_version": "0.0.3"
-    },
-    "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,
-            "fractal": true,
-            "pixel_rain": true,
-            "pixel_flow": 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": "hue_wave",
-            "val": 80
-        },
-        "driver": "is31fl3741",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
-        "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
-                {"matrix": [0, 15], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 15], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 13], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 14], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/acheron/apollo/87h/gamma/keyboard.json b/keyboards/acheron/apollo/87h/gamma/keyboard.json
new file mode 100644
index 00000000000..5c2087c968c
--- /dev/null
+++ b/keyboards/acheron/apollo/87h/gamma/keyboard.json
@@ -0,0 +1,188 @@
+{
+    "keyboard_name": "Apollo87H rev. Gamma",
+    "usb": {
+        "pid": "0x8774",
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": 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,
+            "fractal": true,
+            "pixel_rain": true,
+            "pixel_flow": 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": "hue_wave",
+            "val": 80
+        },
+        "driver": "is31fl3741",
+        "sleep": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
+        "rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
deleted file mode 100644
index 4af646ec021..00000000000
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ /dev/null
@@ -1,15 +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
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 17c09f0f576..cda883bd631 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/87htsc/keyboard.json b/keyboards/acheron/apollo/87htsc/keyboard.json
index 5f7d30e65a3..55229706b1d 100644
--- a/keyboards/acheron/apollo/87htsc/keyboard.json
+++ b/keyboards/acheron/apollo/87htsc/keyboard.json
@@ -72,6 +72,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 17c09f0f576..cda883bd631 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
diff --git a/keyboards/acheron/apollo/88htsc/keyboard.json b/keyboards/acheron/apollo/88htsc/keyboard.json
index e29300019ca..9b9482874f6 100644
--- a/keyboards/acheron/apollo/88htsc/keyboard.json
+++ b/keyboards/acheron/apollo/88htsc/keyboard.json
@@ -72,6 +72,12 @@
         "nkro": false,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
         "rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/acheron/arctic/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/arctic/keyboard.json b/keyboards/acheron/arctic/keyboard.json
index e8c9e92f61c..cc686be5fa2 100644
--- a/keyboards/acheron/arctic/keyboard.json
+++ b/keyboards/acheron/arctic/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"],
         "rows": ["B7", "B6", "A6", "A7", "B1"]
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index c9f1d29f24b..b1264c3fa54 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 
diff --git a/keyboards/acheron/athena/alpha/keyboard.json b/keyboards/acheron/athena/alpha/keyboard.json
index 8570fa12748..7e29cdc0372 100644
--- a/keyboards/acheron/athena/alpha/keyboard.json
+++ b/keyboards/acheron/athena/alpha/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"],
         "rows": ["B9", "C13", "B8", "B5", "A14", "C14"]
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index b2a8d2edf89..79add9aedcb 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/acheron/athena/beta/keyboard.json b/keyboards/acheron/athena/beta/keyboard.json
index 21aa189470e..ba96b201515 100644
--- a/keyboards/acheron/athena/beta/keyboard.json
+++ b/keyboards/acheron/athena/beta/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"],
         "rows": ["C11", "C12", "C10", "A15", "C0", "A1"]
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index a47b76953a2..974ecf1c6c0 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/acheron/austin/keyboard.json b/keyboards/acheron/austin/keyboard.json
index 6c467a7da05..bee675472c9 100755
--- a/keyboards/acheron/austin/keyboard.json
+++ b/keyboards/acheron/austin/keyboard.json
@@ -17,6 +17,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
         "rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
deleted file mode 100644
index 62093e37b23..00000000000
--- a/keyboards/acheron/elongate/beta/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Gondolindrim
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/elongate/beta/keyboard.json b/keyboards/acheron/elongate/beta/keyboard.json
index 80c984caab6..d15f1789911 100644
--- a/keyboards/acheron/elongate/beta/keyboard.json
+++ b/keyboards/acheron/elongate/beta/keyboard.json
@@ -41,6 +41,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
         "rows": ["D3", "B7", "D5", "B5", "D6"]
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 81342ef26dc..09ccd741640 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom.
 
 #define LED1_PIN A2
diff --git a/keyboards/acheron/elongate/delta/keyboard.json b/keyboards/acheron/elongate/delta/keyboard.json
index 33fc5b55ddd..1c6d0927d63 100644
--- a/keyboards/acheron/elongate/delta/keyboard.json
+++ b/keyboards/acheron/elongate/delta/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"],
         "rows": ["B3", "A15", "B0", "B4", "B5"]
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
deleted file mode 100644
index 4b007cf387e..00000000000
--- a/keyboards/acheron/keebspcb/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/keebspcb/keyboard.json b/keyboards/acheron/keebspcb/keyboard.json
index 1017cf47ecf..a4815e10143 100644
--- a/keyboards/acheron/keebspcb/keyboard.json
+++ b/keyboards/acheron/keebspcb/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"],
         "rows": ["B4", "B3", "A2", "A3", "A4"]
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/acheron/lasgweloth/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/lasgweloth/keyboard.json b/keyboards/acheron/lasgweloth/keyboard.json
index ccdf9d6f302..35d30e89b26 100644
--- a/keyboards/acheron/lasgweloth/keyboard.json
+++ b/keyboards/acheron/lasgweloth/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"],
         "rows": ["B9", "B8", "A3", "B0", "B1"]
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index a34ea41cffb..0786a3ac0e6 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json
deleted file mode 100644
index 5250da47276..00000000000
--- a/keyboards/acheron/shark/alpha/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "keyboard_name": "SharkPCB",
-  "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html",
-  "maintainer": "Gondolindrim",
-  "usb": {
-    "pid": "0x5368",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
-    "rows": ["B4", "A15", "B10", "B2"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B6", "pin_b": "B7"}
-    ]
-  },
-  "backlight": {
-    "pin": "B0"
-  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/acheron/shark/alpha/keyboard.json b/keyboards/acheron/shark/alpha/keyboard.json
new file mode 100644
index 00000000000..f88c312a255
--- /dev/null
+++ b/keyboards/acheron/shark/alpha/keyboard.json
@@ -0,0 +1,97 @@
+{
+  "keyboard_name": "SharkPCB",
+  "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html",
+  "maintainer": "Gondolindrim",
+  "usb": {
+    "pid": "0x5368",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "encoder": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
+    "rows": ["B4", "A15", "B10", "B2"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B6", "pin_b": "B7"}
+    ]
+  },
+  "backlight": {
+    "pin": "B0"
+  },
+  "processor": "STM32F303",
+  "bootloader": "stm32-dfu",
+  "board": "QMK_PROTON_C",
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk
index 27db06a0448..16051206467 100644
--- a/keyboards/acheron/shark/alpha/rules.mk
+++ b/keyboards/acheron/shark/alpha/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 1182d39d3b5..4e1b46d085c 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 
diff --git a/keyboards/acheron/shark/beta/keyboard.json b/keyboards/acheron/shark/beta/keyboard.json
index 7f182068a0d..2433f61fecf 100644
--- a/keyboards/acheron/shark/beta/keyboard.json
+++ b/keyboards/acheron/shark/beta/keyboard.json
@@ -15,6 +15,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
         "rows": ["A8", "B14", "A4", "A3"]
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
index fb2a5e1ed7f..ebe7e5398a5 100644
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87h/keyboard.json b/keyboards/acheron/themis/87h/keyboard.json
index ce2037bfade..488cb324c16 100644
--- a/keyboards/acheron/themis/87h/keyboard.json
+++ b/keyboards/acheron/themis/87h/keyboard.json
@@ -19,6 +19,12 @@
         "rgblight":  true,
         "nkro":      true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "eeprom": {
         "wear_leveling": {
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
index fb2a5e1ed7f..ebe7e5398a5 100644
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/87htsc/keyboard.json b/keyboards/acheron/themis/87htsc/keyboard.json
index eaf8a323abb..46cdb092475 100644
--- a/keyboards/acheron/themis/87htsc/keyboard.json
+++ b/keyboards/acheron/themis/87htsc/keyboard.json
@@ -19,6 +19,12 @@
         "rgblight":  true,
         "nkro":      true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "eeprom": {
         "wear_leveling": {
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
index fb2a5e1ed7f..ebe7e5398a5 100644
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
diff --git a/keyboards/acheron/themis/88htsc/keyboard.json b/keyboards/acheron/themis/88htsc/keyboard.json
index f8e65afbade..1e193d2661b 100644
--- a/keyboards/acheron/themis/88htsc/keyboard.json
+++ b/keyboards/acheron/themis/88htsc/keyboard.json
@@ -19,6 +19,12 @@
         "rgblight":  true,
         "nkro":      true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "diode_direction": "COL2ROW",
     "eeprom": {
         "wear_leveling": {
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
deleted file mode 100644
index 86415b251a0..00000000000
--- a/keyboards/ada/infinity81/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ada/infinity81/keyboard.json b/keyboards/ada/infinity81/keyboard.json
index 934bd6fca2c..40c5bd2f180 100644
--- a/keyboards/ada/infinity81/keyboard.json
+++ b/keyboards/ada/infinity81/keyboard.json
@@ -38,6 +38,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"],
         "rows": ["B3", "B2", "B1", "B0", "F6", "B7"]
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
deleted file mode 100644
index 295af783398..00000000000
--- a/keyboards/adafruit/macropad/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "Macropad RP2040",
-    "manufacturer": "Adafruit",
-    "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
-    "maintainer": "Jpe230",
-    "usb": {
-        "vid": "0x239A",
-        "pid": "0x0108",
-        "device_version": "0.0.1"
-    },
-    "audio": {
-        "power_control": {
-            "pin": "GP14"
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP18", "pin_b": "GP17"}
-        ]
-    },
-    "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",
-        "layout": [
-            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
-            {"matrix": [1, 2], "x": 224, "y": 0, "flags": 4},
-            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
-            {"matrix": [2, 1], "x": 112, "y": 21, "flags": 4},
-            {"matrix": [2, 2], "x": 224, "y": 21, "flags": 4},
-            {"matrix": [3, 0], "x": 0, "y": 42, "flags": 4},
-            {"matrix": [3, 1], "x": 112, "y": 42, "flags": 4},
-            {"matrix": [3, 2], "x": 224, "y": 42, "flags": 4},
-            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
-            {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
-            {"matrix": [4, 2], "x": 224, "y": 64, "flags": 4}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [1, 2]
-    },
-    "ws2812": {
-        "pin": "GP19",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "matrix_pins": {
-        "direct": [
-            [null, null, "GP0"],
-            ["GP1", "GP2", "GP3"],
-            ["GP4", "GP5", "GP6"],
-            ["GP7", "GP8", "GP9"],
-            ["GP10", "GP11", "GP12"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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]},
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 0, "y": 4, "matrix": [4, 0]},
-                {"x": 1, "y": 4, "matrix": [4, 1]},
-                {"x": 2, "y": 4, "matrix": [4, 2]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/adafruit/macropad/keyboard.json b/keyboards/adafruit/macropad/keyboard.json
new file mode 100644
index 00000000000..86601c0167f
--- /dev/null
+++ b/keyboards/adafruit/macropad/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Macropad RP2040",
+    "manufacturer": "Adafruit",
+    "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
+    "maintainer": "Jpe230",
+    "usb": {
+        "vid": "0x239A",
+        "pid": "0x0108",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "encoder": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "audio": {
+        "power_control": {
+            "pin": "GP14"
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP18", "pin_b": "GP17"}
+        ]
+    },
+    "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",
+        "layout": [
+            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 112, "y": 21, "flags": 4},
+            {"matrix": [2, 2], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 42, "flags": 4},
+            {"matrix": [3, 1], "x": 112, "y": 42, "flags": 4},
+            {"matrix": [3, 2], "x": 224, "y": 42, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [1, 2]
+    },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            [null, null, "GP0"],
+            ["GP1", "GP2", "GP3"],
+            ["GP4", "GP5", "GP6"],
+            ["GP7", "GP8", "GP9"],
+            ["GP10", "GP11", "GP12"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
index a84e29da3d1..1630b74ceae 100644
--- a/keyboards/adafruit/macropad/rules.mk
+++ b/keyboards/adafruit/macropad/rules.mk
@@ -1,17 +1,2 @@
-# 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 = yes          # Audio output
 AUDIO_DRIVER = pwm_hardware
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
 OLED_TRANSPORT = spi
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
deleted file mode 100644
index db23a531199..00000000000
--- a/keyboards/adelheid/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 floookay
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/adelheid/keyboard.json b/keyboards/adelheid/keyboard.json
index e066e5d5f18..7766a44a8d5 100644
--- a/keyboards/adelheid/keyboard.json
+++ b/keyboards/adelheid/keyboard.json
@@ -17,6 +17,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
         "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"]
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
deleted file mode 100644
index aa7e5a6921e..00000000000
--- a/keyboards/adkb96/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "keyboard_name": "ADKB96",
-    "manufacturer": "Bit Trade One",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x00A5",
-        "pid": "0xAD96",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "tapping": {
-        "term": 100
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_6x16"
-    },
-    "layouts": {
-        "LAYOUT_ortho_6x16": {
-            "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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0},
-                {"matrix": [6, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [7, 0], "x": 8, "y": 1},
-                {"matrix": [7, 1], "x": 9, "y": 1},
-                {"matrix": [7, 2], "x": 10, "y": 1},
-                {"matrix": [7, 3], "x": 11, "y": 1},
-                {"matrix": [7, 4], "x": 12, "y": 1},
-                {"matrix": [7, 5], "x": 13, "y": 1},
-                {"matrix": [7, 6], "x": 14, "y": 1},
-                {"matrix": [7, 7], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"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": [8, 0], "x": 8, "y": 2},
-                {"matrix": [8, 1], "x": 9, "y": 2},
-                {"matrix": [8, 2], "x": 10, "y": 2},
-                {"matrix": [8, 3], "x": 11, "y": 2},
-                {"matrix": [8, 4], "x": 12, "y": 2},
-                {"matrix": [8, 5], "x": 13, "y": 2},
-                {"matrix": [8, 6], "x": 14, "y": 2},
-                {"matrix": [8, 7], "x": 15, "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": [9, 0], "x": 8, "y": 3},
-                {"matrix": [9, 1], "x": 9, "y": 3},
-                {"matrix": [9, 2], "x": 10, "y": 3},
-                {"matrix": [9, 3], "x": 11, "y": 3},
-                {"matrix": [9, 4], "x": 12, "y": 3},
-                {"matrix": [9, 5], "x": 13, "y": 3},
-                {"matrix": [9, 6], "x": 14, "y": 3},
-                {"matrix": [9, 7], "x": 15, "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": [10, 0], "x": 8, "y": 4},
-                {"matrix": [10, 1], "x": 9, "y": 4},
-                {"matrix": [10, 2], "x": 10, "y": 4},
-                {"matrix": [10, 3], "x": 11, "y": 4},
-                {"matrix": [10, 4], "x": 12, "y": 4},
-                {"matrix": [10, 5], "x": 13, "y": 4},
-                {"matrix": [10, 6], "x": 14, "y": 4},
-                {"matrix": [10, 7], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-                {"matrix": [5, 4], "x": 4, "y": 5},
-                {"matrix": [5, 5], "x": 5, "y": 5},
-                {"matrix": [5, 6], "x": 6, "y": 5},
-                {"matrix": [5, 7], "x": 7, "y": 5},
-                {"matrix": [11, 0], "x": 8, "y": 5},
-                {"matrix": [11, 1], "x": 9, "y": 5},
-                {"matrix": [11, 2], "x": 10, "y": 5},
-                {"matrix": [11, 3], "x": 11, "y": 5},
-                {"matrix": [11, 4], "x": 12, "y": 5},
-                {"matrix": [11, 5], "x": 13, "y": 5},
-                {"matrix": [11, 6], "x": 14, "y": 5},
-                {"matrix": [11, 7], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
deleted file mode 100644
index 0b8941e7760..00000000000
--- a/keyboards/adkb96/rev1/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/adkb96/rev1/keyboard.json b/keyboards/adkb96/rev1/keyboard.json
new file mode 100644
index 00000000000..77f9177555a
--- /dev/null
+++ b/keyboards/adkb96/rev1/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "ADKB96",
+    "manufacturer": "Bit Trade One",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x00A5",
+        "pid": "0xAD96",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "tapping": {
+        "term": 100
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_6x16"
+    },
+    "layouts": {
+        "LAYOUT_ortho_6x16": {
+            "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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [7, 0], "x": 8, "y": 1},
+                {"matrix": [7, 1], "x": 9, "y": 1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 6], "x": 14, "y": 1},
+                {"matrix": [7, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"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": [8, 0], "x": 8, "y": 2},
+                {"matrix": [8, 1], "x": 9, "y": 2},
+                {"matrix": [8, 2], "x": 10, "y": 2},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 4], "x": 12, "y": 2},
+                {"matrix": [8, 5], "x": 13, "y": 2},
+                {"matrix": [8, 6], "x": 14, "y": 2},
+                {"matrix": [8, 7], "x": 15, "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": [9, 0], "x": 8, "y": 3},
+                {"matrix": [9, 1], "x": 9, "y": 3},
+                {"matrix": [9, 2], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 4], "x": 12, "y": 3},
+                {"matrix": [9, 5], "x": 13, "y": 3},
+                {"matrix": [9, 6], "x": 14, "y": 3},
+                {"matrix": [9, 7], "x": 15, "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": [10, 0], "x": 8, "y": 4},
+                {"matrix": [10, 1], "x": 9, "y": 4},
+                {"matrix": [10, 2], "x": 10, "y": 4},
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4},
+                {"matrix": [10, 5], "x": 13, "y": 4},
+                {"matrix": [10, 6], "x": 14, "y": 4},
+                {"matrix": [10, 7], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+                {"matrix": [5, 4], "x": 4, "y": 5},
+                {"matrix": [5, 5], "x": 5, "y": 5},
+                {"matrix": [5, 6], "x": 6, "y": 5},
+                {"matrix": [5, 7], "x": 7, "y": 5},
+                {"matrix": [11, 0], "x": 8, "y": 5},
+                {"matrix": [11, 1], "x": 9, "y": 5},
+                {"matrix": [11, 2], "x": 10, "y": 5},
+                {"matrix": [11, 3], "x": 11, "y": 5},
+                {"matrix": [11, 4], "x": 12, "y": 5},
+                {"matrix": [11, 5], "x": 13, "y": 5},
+                {"matrix": [11, 6], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/adkb96/rev1/rules.mk b/keyboards/adkb96/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk
index 2b74eb41834..ac7561b21dd 100644
--- a/keyboards/adkb96/rules.mk
+++ b/keyboards/adkb96/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # 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. 
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = adkb96/rev1
diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/keyboard.json
similarity index 100%
rename from keyboards/adpenrose/mine/info.json
rename to keyboards/adpenrose/mine/keyboard.json
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
deleted file mode 100644
index 8606067a4cf..00000000000
--- a/keyboards/aeboards/aegis/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aeboards/aegis/keyboard.json b/keyboards/aeboards/aegis/keyboard.json
index 26414ba55a3..26f5f2a0c1c 100644
--- a/keyboards/aeboards/aegis/keyboard.json
+++ b/keyboards/aeboards/aegis/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"],
         "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"]
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
deleted file mode 100755
index 01155887a5e..00000000000
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json
deleted file mode 100644
index 9001eec1c5e..00000000000
--- a/keyboards/aeboards/constellation/rev1/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "keyboard_name": "Constellation Rev1",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x4145",
-        "pid": "0x065C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B1", "F0", "F1", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_rwkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_rwkl_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/constellation/rev1/keyboard.json b/keyboards/aeboards/constellation/rev1/keyboard.json
new file mode 100644
index 00000000000..5a43568d57c
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev1/keyboard.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Constellation Rev1",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/constellation/rev1/rules.mk b/keyboards/aeboards/constellation/rev1/rules.mk
deleted file mode 100755
index bc5a3a3498a..00000000000
--- a/keyboards/aeboards/constellation/rev1/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index f4b7be6bdf7..2091bab964c 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json
deleted file mode 100644
index b8dae5f20cf..00000000000
--- a/keyboards/aeboards/constellation/rev2/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "keyboard_name": "Constellation Rev2",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x4145",
-        "pid": "0x065C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
-        "rows": ["B15", "A14", "A2", "B13", "B14"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "processor": "STM32L422",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_rwkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_rwkl_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/constellation/rev2/keyboard.json b/keyboards/aeboards/constellation/rev2/keyboard.json
new file mode 100644
index 00000000000..f296b523e0b
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev2/keyboard.json
@@ -0,0 +1,190 @@
+{
+    "keyboard_name": "Constellation Rev2",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["B15", "A14", "A2", "B13", "B14"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/constellation/rev2/rules.mk b/keyboards/aeboards/constellation/rev2/rules.mk
deleted file mode 100755
index c12086843f1..00000000000
--- a/keyboards/aeboards/constellation/rev2/rules.mk
+++ /dev/null
@@ -1,11 +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 = 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
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
deleted file mode 100755
index 01155887a5e..00000000000
--- a/keyboards/aeboards/constellation/rev3/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- * Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json
deleted file mode 100644
index 6e38e99fe91..00000000000
--- a/keyboards/aeboards/constellation/rev3/info.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-    "keyboard_name": "Constellation Rev3",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x4145",
-        "pid": "0x065D",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B1", "F0", "F1", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_rwkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_rwkl_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/constellation/rev3/keyboard.json b/keyboards/aeboards/constellation/rev3/keyboard.json
new file mode 100644
index 00000000000..ab39641b74b
--- /dev/null
+++ b/keyboards/aeboards/constellation/rev3/keyboard.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Constellation Rev3",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x065D",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk
deleted file mode 100755
index bc5a3a3498a..00000000000
--- a/keyboards/aeboards/constellation/rev3/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json
deleted file mode 100644
index 0e110e92357..00000000000
--- a/keyboards/aeboards/ext65/rev1/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "Ext65 Rev1",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "pid": "0xAE65",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"],
-        "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "B7", "E6"]
-    },
-    "layout_aliases": {
-        "LAYOUT_ext65": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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.5, "y": 0},
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [1, 4], "x": 9.5, "y": 0},
-                {"matrix": [0, 5], "x": 10.5, "y": 0},
-                {"matrix": [1, 5], "x": 11.5, "y": 0},
-                {"matrix": [0, 6], "x": 12.5, "y": 0},
-                {"matrix": [1, 6], "x": 13.5, "y": 0},
-                {"matrix": [0, 7], "x": 14.5, "y": 0},
-                {"matrix": [1, 7], "x": 15.5, "y": 0},
-                {"matrix": [0, 8], "x": 16.5, "y": 0},
-                {"matrix": [1, 8], "x": 17.5, "y": 0},
-                {"matrix": [5, 8], "x": 18.5, "y": 0},
-                {"matrix": [0, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [3, 0], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-
-                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 2], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 3], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [3, 5], "x": 12, "y": 1},
-                {"matrix": [2, 6], "x": 13, "y": 1},
-                {"matrix": [3, 6], "x": 14, "y": 1},
-                {"matrix": [2, 7], "x": 15, "y": 1},
-                {"matrix": [3, 7], "x": 16, "y": 1},
-                {"matrix": [2, 8], "x": 17, "y": 1},
-                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
-                {"matrix": [2, 9], "x": 19.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [4, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-
-                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
-                {"matrix": [5, 2], "x": 6.25, "y": 2},
-                {"matrix": [4, 3], "x": 7.25, "y": 2},
-                {"matrix": [5, 3], "x": 8.25, "y": 2},
-                {"matrix": [4, 4], "x": 9.25, "y": 2},
-                {"matrix": [5, 4], "x": 10.25, "y": 2},
-                {"matrix": [4, 5], "x": 11.25, "y": 2},
-                {"matrix": [5, 5], "x": 12.25, "y": 2},
-                {"matrix": [4, 6], "x": 13.25, "y": 2},
-                {"matrix": [5, 6], "x": 14.25, "y": 2},
-                {"matrix": [4, 7], "x": 15.25, "y": 2},
-                {"matrix": [5, 7], "x": 16.25, "y": 2},
-                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
-                {"matrix": [4, 9], "x": 19.5, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-                {"matrix": [6, 1], "x": 2, "y": 3},
-                {"matrix": [7, 1], "x": 3, "y": 3},
-
-                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 2], "x": 6.75, "y": 3},
-                {"matrix": [6, 3], "x": 7.75, "y": 3},
-                {"matrix": [7, 3], "x": 8.75, "y": 3},
-                {"matrix": [6, 4], "x": 9.75, "y": 3},
-                {"matrix": [7, 4], "x": 10.75, "y": 3},
-                {"matrix": [6, 5], "x": 11.75, "y": 3},
-                {"matrix": [7, 5], "x": 12.75, "y": 3},
-                {"matrix": [6, 6], "x": 13.75, "y": 3},
-                {"matrix": [7, 6], "x": 14.75, "y": 3},
-                {"matrix": [6, 7], "x": 15.75, "y": 3},
-                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
-                {"matrix": [6, 8], "x": 18.5, "y": 3},
-                {"matrix": [7, 9], "x": 19.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [9, 0], "x": 1, "y": 4},
-                {"matrix": [8, 1], "x": 2, "y": 4},
-                {"matrix": [9, 1], "x": 3, "y": 4},
-
-                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 6, "y": 4},
-                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
-                {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
-                {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 16, "y": 4},
-
-                {"matrix": [9, 8], "x": 17.5, "y": 4},
-                {"matrix": [8, 8], "x": 18.5, "y": 4},
-                {"matrix": [9, 9], "x": 19.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/ext65/rev1/keyboard.json b/keyboards/aeboards/ext65/rev1/keyboard.json
new file mode 100644
index 00000000000..c254a671421
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev1/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Ext65 Rev1",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "pid": "0xAE65",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "B0", "F7", "F0", "F1", "F4", "F5", "F6"],
+        "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "B7", "E6"]
+    },
+    "layout_aliases": {
+        "LAYOUT_ext65": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+                {"matrix": [0, 5], "x": 10.5, "y": 0},
+                {"matrix": [1, 5], "x": 11.5, "y": 0},
+                {"matrix": [0, 6], "x": 12.5, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [0, 7], "x": 14.5, "y": 0},
+                {"matrix": [1, 7], "x": 15.5, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [5, 8], "x": 18.5, "y": 0},
+                {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 3], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+                {"matrix": [3, 5], "x": 12, "y": 1},
+                {"matrix": [2, 6], "x": 13, "y": 1},
+                {"matrix": [3, 6], "x": 14, "y": 1},
+                {"matrix": [2, 7], "x": 15, "y": 1},
+                {"matrix": [3, 7], "x": 16, "y": 1},
+                {"matrix": [2, 8], "x": 17, "y": 1},
+                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+                {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 8.25, "y": 2},
+                {"matrix": [4, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [4, 6], "x": 13.25, "y": 2},
+                {"matrix": [5, 6], "x": 14.25, "y": 2},
+                {"matrix": [4, 7], "x": 15.25, "y": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+                {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 6.75, "y": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 3], "x": 8.75, "y": 3},
+                {"matrix": [6, 4], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 3},
+                {"matrix": [6, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 5], "x": 12.75, "y": 3},
+                {"matrix": [6, 6], "x": 13.75, "y": 3},
+                {"matrix": [7, 6], "x": 14.75, "y": 3},
+                {"matrix": [6, 7], "x": 15.75, "y": 3},
+                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [9, 1], "x": 3, "y": 4},
+
+                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 6, "y": 4},
+                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+                {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+                {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 16, "y": 4},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 8], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/ext65/rev1/rules.mk b/keyboards/aeboards/ext65/rev1/rules.mk
deleted file mode 100644
index 29eb5c8fbe8..00000000000
--- a/keyboards/aeboards/ext65/rev1/rules.mk
+++ /dev/null
@@ -1,11 +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
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
deleted file mode 100644
index ab229e19ec6..00000000000
--- a/keyboards/aeboards/ext65/rev2/info.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-    "keyboard_name": "Ext65 Rev2",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "pid": "0xA652",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 6,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
-        "rows": ["A10", "A9", "A8", "B7", "A2", "A1", "B12", "B11", "B10", "B2"]
-    },
-    "layout_aliases": {
-        "LAYOUT_ext65": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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.5, "y": 0},
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [1, 4], "x": 9.5, "y": 0},
-                {"matrix": [0, 5], "x": 10.5, "y": 0},
-                {"matrix": [1, 5], "x": 11.5, "y": 0},
-                {"matrix": [0, 6], "x": 12.5, "y": 0},
-                {"matrix": [1, 6], "x": 13.5, "y": 0},
-                {"matrix": [0, 7], "x": 14.5, "y": 0},
-                {"matrix": [1, 7], "x": 15.5, "y": 0},
-                {"matrix": [0, 8], "x": 16.5, "y": 0},
-                {"matrix": [1, 8], "x": 17.5, "y": 0},
-                {"matrix": [5, 8], "x": 18.5, "y": 0},
-                {"matrix": [0, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [3, 0], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-
-                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 2], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 3], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [3, 5], "x": 12, "y": 1},
-                {"matrix": [2, 6], "x": 13, "y": 1},
-                {"matrix": [3, 6], "x": 14, "y": 1},
-                {"matrix": [2, 7], "x": 15, "y": 1},
-                {"matrix": [3, 7], "x": 16, "y": 1},
-                {"matrix": [2, 8], "x": 17, "y": 1},
-                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
-                {"matrix": [2, 9], "x": 19.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [4, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-
-                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
-                {"matrix": [5, 2], "x": 6.25, "y": 2},
-                {"matrix": [4, 3], "x": 7.25, "y": 2},
-                {"matrix": [5, 3], "x": 8.25, "y": 2},
-                {"matrix": [4, 4], "x": 9.25, "y": 2},
-                {"matrix": [5, 4], "x": 10.25, "y": 2},
-                {"matrix": [4, 5], "x": 11.25, "y": 2},
-                {"matrix": [5, 5], "x": 12.25, "y": 2},
-                {"matrix": [4, 6], "x": 13.25, "y": 2},
-                {"matrix": [5, 6], "x": 14.25, "y": 2},
-                {"matrix": [4, 7], "x": 15.25, "y": 2},
-                {"matrix": [5, 7], "x": 16.25, "y": 2},
-                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
-                {"matrix": [4, 9], "x": 19.5, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-                {"matrix": [6, 1], "x": 2, "y": 3},
-                {"matrix": [7, 1], "x": 3, "y": 3},
-
-                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 2], "x": 6.75, "y": 3},
-                {"matrix": [6, 3], "x": 7.75, "y": 3},
-                {"matrix": [7, 3], "x": 8.75, "y": 3},
-                {"matrix": [6, 4], "x": 9.75, "y": 3},
-                {"matrix": [7, 4], "x": 10.75, "y": 3},
-                {"matrix": [6, 5], "x": 11.75, "y": 3},
-                {"matrix": [7, 5], "x": 12.75, "y": 3},
-                {"matrix": [6, 6], "x": 13.75, "y": 3},
-                {"matrix": [7, 6], "x": 14.75, "y": 3},
-                {"matrix": [6, 7], "x": 15.75, "y": 3},
-                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
-                {"matrix": [6, 8], "x": 18.5, "y": 3},
-                {"matrix": [7, 9], "x": 19.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [9, 0], "x": 1, "y": 4},
-                {"matrix": [8, 1], "x": 2, "y": 4},
-                {"matrix": [9, 1], "x": 3, "y": 4},
-
-                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 6, "y": 4},
-                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
-                {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
-                {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 16, "y": 4},
-
-                {"matrix": [9, 8], "x": 17.5, "y": 4},
-                {"matrix": [8, 8], "x": 18.5, "y": 4},
-                {"matrix": [9, 9], "x": 19.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/ext65/rev2/keyboard.json b/keyboards/aeboards/ext65/rev2/keyboard.json
new file mode 100644
index 00000000000..0ab50f92582
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev2/keyboard.json
@@ -0,0 +1,158 @@
+{
+    "keyboard_name": "Ext65 Rev2",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "pid": "0xA652",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 6,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B14", "B6", "A0", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "rows": ["A10", "A9", "A8", "B7", "A2", "A1", "B12", "B11", "B10", "B2"]
+    },
+    "layout_aliases": {
+        "LAYOUT_ext65": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+                {"matrix": [0, 5], "x": 10.5, "y": 0},
+                {"matrix": [1, 5], "x": 11.5, "y": 0},
+                {"matrix": [0, 6], "x": 12.5, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [0, 7], "x": 14.5, "y": 0},
+                {"matrix": [1, 7], "x": 15.5, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [5, 8], "x": 18.5, "y": 0},
+                {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 3], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+                {"matrix": [3, 5], "x": 12, "y": 1},
+                {"matrix": [2, 6], "x": 13, "y": 1},
+                {"matrix": [3, 6], "x": 14, "y": 1},
+                {"matrix": [2, 7], "x": 15, "y": 1},
+                {"matrix": [3, 7], "x": 16, "y": 1},
+                {"matrix": [2, 8], "x": 17, "y": 1},
+                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+                {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 8.25, "y": 2},
+                {"matrix": [4, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [4, 6], "x": 13.25, "y": 2},
+                {"matrix": [5, 6], "x": 14.25, "y": 2},
+                {"matrix": [4, 7], "x": 15.25, "y": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+                {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 6.75, "y": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 3], "x": 8.75, "y": 3},
+                {"matrix": [6, 4], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 3},
+                {"matrix": [6, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 5], "x": 12.75, "y": 3},
+                {"matrix": [6, 6], "x": 13.75, "y": 3},
+                {"matrix": [7, 6], "x": 14.75, "y": 3},
+                {"matrix": [6, 7], "x": 15.75, "y": 3},
+                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4},
+                {"matrix": [9, 1], "x": 3, "y": 4},
+
+                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 6, "y": 4},
+                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5},
+                {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25},
+                {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 16, "y": 4},
+
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 8], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
deleted file mode 100644
index b9637955ff7..00000000000
--- a/keyboards/aeboards/ext65/rev2/rules.mk
+++ /dev/null
@@ -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 = yes        # 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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json
deleted file mode 100644
index 0faf6fa135a..00000000000
--- a/keyboards/aeboards/ext65/rev3/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "Ext65 Rev3",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "pid": "0xA653",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "num_lock": "F5",
-        "scroll_lock": "F1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "D5", "D3", "D2", "D1", "D0"],
-        "rows": ["B5", "B6", "C6", "C7", "E6", "B0", "B4", "D7", "D4", "D6"]
-    },
-    "layout_aliases": {
-        "LAYOUT_ext65_hotswap": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "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.5, "y": 0},
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [1, 4], "x": 9.5, "y": 0},
-                {"matrix": [0, 5], "x": 10.5, "y": 0},
-                {"matrix": [1, 5], "x": 11.5, "y": 0},
-                {"matrix": [0, 6], "x": 12.5, "y": 0},
-                {"matrix": [1, 6], "x": 13.5, "y": 0},
-                {"matrix": [0, 7], "x": 14.5, "y": 0},
-                {"matrix": [1, 7], "x": 15.5, "y": 0},
-                {"matrix": [0, 8], "x": 16.5, "y": 0},
-                {"matrix": [1, 8], "x": 17.5, "y": 0, "w": 2},
-                {"matrix": [0, 9], "x": 19.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "h": 2},
-                {"matrix": [3, 0], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-
-                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 2], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 3], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [3, 5], "x": 12, "y": 1},
-                {"matrix": [2, 6], "x": 13, "y": 1},
-                {"matrix": [3, 6], "x": 14, "y": 1},
-                {"matrix": [2, 7], "x": 15, "y": 1},
-                {"matrix": [3, 7], "x": 16, "y": 1},
-                {"matrix": [2, 8], "x": 17, "y": 1},
-                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
-                {"matrix": [2, 9], "x": 19.5, "y": 1},
-
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [4, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-
-                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
-                {"matrix": [5, 2], "x": 6.25, "y": 2},
-                {"matrix": [4, 3], "x": 7.25, "y": 2},
-                {"matrix": [5, 3], "x": 8.25, "y": 2},
-                {"matrix": [4, 4], "x": 9.25, "y": 2},
-                {"matrix": [5, 4], "x": 10.25, "y": 2},
-                {"matrix": [4, 5], "x": 11.25, "y": 2},
-                {"matrix": [5, 5], "x": 12.25, "y": 2},
-                {"matrix": [4, 6], "x": 13.25, "y": 2},
-                {"matrix": [5, 6], "x": 14.25, "y": 2},
-                {"matrix": [4, 7], "x": 15.25, "y": 2},
-                {"matrix": [5, 7], "x": 16.25, "y": 2},
-                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
-                {"matrix": [4, 9], "x": 19.5, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "h": 2},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-                {"matrix": [6, 1], "x": 2, "y": 3},
-                {"matrix": [7, 1], "x": 3, "y": 3},
-
-                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
-                {"matrix": [7, 2], "x": 6.75, "y": 3},
-                {"matrix": [6, 3], "x": 7.75, "y": 3},
-                {"matrix": [7, 3], "x": 8.75, "y": 3},
-                {"matrix": [6, 4], "x": 9.75, "y": 3},
-                {"matrix": [7, 4], "x": 10.75, "y": 3},
-                {"matrix": [6, 5], "x": 11.75, "y": 3},
-                {"matrix": [7, 5], "x": 12.75, "y": 3},
-                {"matrix": [6, 6], "x": 13.75, "y": 3},
-                {"matrix": [7, 6], "x": 14.75, "y": 3},
-                {"matrix": [6, 7], "x": 15.75, "y": 3},
-                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
-                {"matrix": [6, 8], "x": 18.5, "y": 3},
-                {"matrix": [7, 9], "x": 19.5, "y": 3},
-
-                {"matrix": [9, 0], "x": 1, "y": 4},
-                {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
-
-                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 5.75, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 8.25, "y": 4, "w": 6.25},
-                {"matrix": [9, 6], "x": 14.5, "y": 4, "w": 1.5},
-                {"matrix": [8, 7], "x": 16, "y": 4, "w": 1.5},
-                {"matrix": [9, 8], "x": 17.5, "y": 4},
-                {"matrix": [8, 8], "x": 18.5, "y": 4},
-                {"matrix": [9, 9], "x": 19.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/ext65/rev3/keyboard.json b/keyboards/aeboards/ext65/rev3/keyboard.json
new file mode 100644
index 00000000000..8c8051fc444
--- /dev/null
+++ b/keyboards/aeboards/ext65/rev3/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "Ext65 Rev3",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "pid": "0xA653",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "num_lock": "F5",
+        "scroll_lock": "F1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["B5", "B6", "C6", "C7", "E6", "B0", "B4", "D7", "D4", "D6"]
+    },
+    "layout_aliases": {
+        "LAYOUT_ext65_hotswap": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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.5, "y": 0},
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+                {"matrix": [0, 5], "x": 10.5, "y": 0},
+                {"matrix": [1, 5], "x": 11.5, "y": 0},
+                {"matrix": [0, 6], "x": 12.5, "y": 0},
+                {"matrix": [1, 6], "x": 13.5, "y": 0},
+                {"matrix": [0, 7], "x": 14.5, "y": 0},
+                {"matrix": [1, 7], "x": 15.5, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0, "w": 2},
+                {"matrix": [0, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "h": 2},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+
+                {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 3], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 4], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+                {"matrix": [3, 5], "x": 12, "y": 1},
+                {"matrix": [2, 6], "x": 13, "y": 1},
+                {"matrix": [3, 6], "x": 14, "y": 1},
+                {"matrix": [2, 7], "x": 15, "y": 1},
+                {"matrix": [3, 7], "x": 16, "y": 1},
+                {"matrix": [2, 8], "x": 17, "y": 1},
+                {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5},
+                {"matrix": [2, 9], "x": 19.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+
+                {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 8.25, "y": 2},
+                {"matrix": [4, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [4, 6], "x": 13.25, "y": 2},
+                {"matrix": [5, 6], "x": 14.25, "y": 2},
+                {"matrix": [4, 7], "x": 15.25, "y": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
+                {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25},
+                {"matrix": [4, 9], "x": 19.5, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+
+                {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 2], "x": 6.75, "y": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 3], "x": 8.75, "y": 3},
+                {"matrix": [6, 4], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 3},
+                {"matrix": [6, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 5], "x": 12.75, "y": 3},
+                {"matrix": [6, 6], "x": 13.75, "y": 3},
+                {"matrix": [7, 6], "x": 14.75, "y": 3},
+                {"matrix": [6, 7], "x": 15.75, "y": 3},
+                {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
+
+                {"matrix": [9, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
+
+                {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 5.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 8.25, "y": 4, "w": 6.25},
+                {"matrix": [9, 6], "x": 14.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 7], "x": 16, "y": 4, "w": 1.5},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 8], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk
index f1ec6515067..1716098b3e1 100644
--- a/keyboards/aeboards/ext65/rev3/rules.mk
+++ b/keyboards/aeboards/ext65/rev3/rules.mk
@@ -1,13 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 OPT = 3
-LTO_ENABLE = yes
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json
deleted file mode 100644
index 68256ed8699..00000000000
--- a/keyboards/aeboards/satellite/rev1/info.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "keyboard_name": "Satellite Rev1",
-    "manufacturer": "AEBoards",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x4145",
-        "pid": "0x6553",
-        "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_flow": 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": "cycle_all",
-            "val": 80
-        },
-        "driver": "custom",
-        "sleep": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["E6", "D5", "B2", "B3", "B7", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B1", "F0", "F4", "F1"]
-    },
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_rwkl"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_rwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aeboards/satellite/rev1/keyboard.json b/keyboards/aeboards/satellite/rev1/keyboard.json
new file mode 100644
index 00000000000..8b90704efa4
--- /dev/null
+++ b/keyboards/aeboards/satellite/rev1/keyboard.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "Satellite Rev1",
+    "manufacturer": "AEBoards",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x4145",
+        "pid": "0x6553",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": 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_fractal": true,
+            "pixel_flow": 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": "cycle_all",
+            "val": 80
+        },
+        "driver": "custom",
+        "sleep": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "B7", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F4", "F1"]
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_rwkl"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk
index f95b0f015d7..7149ec106a1 100644
--- a/keyboards/aeboards/satellite/rev1/rules.mk
+++ b/keyboards/aeboards/satellite/rev1/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
-
 COMMON_VPATH += $(DRIVER_PATH)/issi
 
 # project specific files
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
deleted file mode 100644
index 0afb37957fe..00000000000
--- a/keyboards/afternoonlabs/breeze/rev0/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Breeze",
-    "manufacturer": "AfternoonLabs",
-    "url": "afternoonlabs.com/breeze",
-    "maintainer": "eithanshavit",
-    "usb": {
-        "vid": "0x616C",
-        "pid": "0x0001",
-        "device_version": "0.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0.375},
-                {"matrix": [0, 4], "x": 1, "y": 0.375},
-                {"matrix": [0, 3], "x": 2, "y": 0.125},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0.125},
-                {"matrix": [0, 0], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 0], "x": 9.75, "y": 0.25},
-                {"matrix": [5, 1], "x": 10.75, "y": 0.125},
-                {"matrix": [5, 2], "x": 11.75, "y": 0},
-                {"matrix": [5, 3], "x": 12.75, "y": 0.125},
-                {"matrix": [5, 4], "x": 13.75, "y": 0.375},
-                {"matrix": [5, 5], "x": 14.75, "y": 0.375},
-
-                {"matrix": [5, 6], "x": 16, "y": 0.375},
-                {"matrix": [5, 7], "x": 17, "y": 0.375},
-                {"matrix": [5, 8], "x": 18, "y": 0.375},
-
-                {"matrix": [1, 5], "x": 0, "y": 1.375},
-                {"matrix": [1, 4], "x": 1, "y": 1.375},
-                {"matrix": [1, 3], "x": 2, "y": 1.125},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1.125},
-                {"matrix": [1, 0], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1.25},
-                {"matrix": [6, 1], "x": 10.75, "y": 1.125},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1.125},
-                {"matrix": [6, 4], "x": 13.75, "y": 1.375},
-                {"matrix": [6, 5], "x": 14.75, "y": 1.375},
-
-                {"matrix": [6, 6], "x": 16, "y": 1.375},
-                {"matrix": [6, 7], "x": 17, "y": 1.375},
-                {"matrix": [6, 8], "x": 18, "y": 1.375},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.375},
-                {"matrix": [2, 4], "x": 1, "y": 2.375},
-                {"matrix": [2, 3], "x": 2, "y": 2.125},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2.125},
-                {"matrix": [2, 0], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
-                {"matrix": [7, 1], "x": 10.75, "y": 2.125},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2.125},
-                {"matrix": [7, 4], "x": 13.75, "y": 2.375},
-                {"matrix": [7, 5], "x": 14.75, "y": 2.375},
-
-                {"matrix": [7, 7], "x": 17, "y": 2.375},
-
-                {"matrix": [3, 5], "x": 0, "y": 3.375},
-                {"matrix": [3, 4], "x": 1, "y": 3.375},
-                {"matrix": [3, 3], "x": 2, "y": 3.125},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 1], "x": 4, "y": 3.125},
-                {"matrix": [3, 0], "x": 5, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 3.125},
-                {"matrix": [8, 2], "x": 11.75, "y": 3},
-                {"matrix": [8, 3], "x": 12.75, "y": 3.125},
-                {"matrix": [8, 4], "x": 13.75, "y": 3.375},
-                {"matrix": [8, 5], "x": 14.75, "y": 3.375},
-
-                {"matrix": [8, 6], "x": 16, "y": 3.375},
-                {"matrix": [8, 7], "x": 17, "y": 3.375},
-                {"matrix": [8, 8], "x": 18, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
-                {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
-
-                {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
-                {"matrix": [9, 1], "x": 10.25, "y": 4.5},
-                {"matrix": [9, 2], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 12.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/afternoonlabs/breeze/rev0/keyboard.json b/keyboards/afternoonlabs/breeze/rev0/keyboard.json
new file mode 100644
index 00000000000..f20f082ec96
--- /dev/null
+++ b/keyboards/afternoonlabs/breeze/rev0/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Breeze",
+    "manufacturer": "AfternoonLabs",
+    "url": "afternoonlabs.com/breeze",
+    "maintainer": "eithanshavit",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0001",
+        "device_version": "0.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0.375},
+                {"matrix": [0, 4], "x": 1, "y": 0.375},
+                {"matrix": [0, 3], "x": 2, "y": 0.125},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0.125},
+                {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 0], "x": 9.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 10.75, "y": 0.125},
+                {"matrix": [5, 2], "x": 11.75, "y": 0},
+                {"matrix": [5, 3], "x": 12.75, "y": 0.125},
+                {"matrix": [5, 4], "x": 13.75, "y": 0.375},
+                {"matrix": [5, 5], "x": 14.75, "y": 0.375},
+
+                {"matrix": [5, 6], "x": 16, "y": 0.375},
+                {"matrix": [5, 7], "x": 17, "y": 0.375},
+                {"matrix": [5, 8], "x": 18, "y": 0.375},
+
+                {"matrix": [1, 5], "x": 0, "y": 1.375},
+                {"matrix": [1, 4], "x": 1, "y": 1.375},
+                {"matrix": [1, 3], "x": 2, "y": 1.125},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1.125},
+                {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 10.75, "y": 1.125},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1.125},
+                {"matrix": [6, 4], "x": 13.75, "y": 1.375},
+                {"matrix": [6, 5], "x": 14.75, "y": 1.375},
+
+                {"matrix": [6, 6], "x": 16, "y": 1.375},
+                {"matrix": [6, 7], "x": 17, "y": 1.375},
+                {"matrix": [6, 8], "x": 18, "y": 1.375},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.375},
+                {"matrix": [2, 4], "x": 1, "y": 2.375},
+                {"matrix": [2, 3], "x": 2, "y": 2.125},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2.125},
+                {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.125},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.125},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.375},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.375},
+
+                {"matrix": [7, 7], "x": 17, "y": 2.375},
+
+                {"matrix": [3, 5], "x": 0, "y": 3.375},
+                {"matrix": [3, 4], "x": 1, "y": 3.375},
+                {"matrix": [3, 3], "x": 2, "y": 3.125},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3.125},
+                {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.125},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.125},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.375},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.375},
+
+                {"matrix": [8, 6], "x": 16, "y": 3.375},
+                {"matrix": [8, 7], "x": 17, "y": 3.375},
+                {"matrix": [8, 8], "x": 18, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+                {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
+
+                {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
+                {"matrix": [9, 1], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/afternoonlabs/breeze/rev0/rules.mk b/keyboards/afternoonlabs/breeze/rev0/rules.mk
deleted file mode 100644
index 7b63c0c2988..00000000000
--- a/keyboards/afternoonlabs/breeze/rev0/rules.mk
+++ /dev/null
@@ -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       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
deleted file mode 100644
index 21b6a7a4364..00000000000
--- a/keyboards/afternoonlabs/breeze/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Breeze",
-    "manufacturer": "AfternoonLabs",
-    "url": "afternoonlabs.com/breeze",
-    "maintainer": "eithanshavit",
-    "usb": {
-        "vid": "0x616C",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0.375},
-                {"matrix": [0, 4], "x": 1, "y": 0.375},
-                {"matrix": [0, 3], "x": 2, "y": 0.125},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0.125},
-                {"matrix": [0, 0], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 0], "x": 9.75, "y": 0.25},
-                {"matrix": [5, 1], "x": 10.75, "y": 0.125},
-                {"matrix": [5, 2], "x": 11.75, "y": 0},
-                {"matrix": [5, 3], "x": 12.75, "y": 0.125},
-                {"matrix": [5, 4], "x": 13.75, "y": 0.375},
-                {"matrix": [5, 5], "x": 14.75, "y": 0.375},
-
-                {"matrix": [5, 6], "x": 16, "y": 0.375},
-                {"matrix": [5, 7], "x": 17, "y": 0.375},
-                {"matrix": [5, 8], "x": 18, "y": 0.375},
-
-                {"matrix": [1, 5], "x": 0, "y": 1.375},
-                {"matrix": [1, 4], "x": 1, "y": 1.375},
-                {"matrix": [1, 3], "x": 2, "y": 1.125},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1.125},
-                {"matrix": [1, 0], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 1.25},
-                {"matrix": [6, 1], "x": 10.75, "y": 1.125},
-                {"matrix": [6, 2], "x": 11.75, "y": 1},
-                {"matrix": [6, 3], "x": 12.75, "y": 1.125},
-                {"matrix": [6, 4], "x": 13.75, "y": 1.375},
-                {"matrix": [6, 5], "x": 14.75, "y": 1.375},
-
-                {"matrix": [6, 6], "x": 16, "y": 1.375},
-                {"matrix": [6, 7], "x": 17, "y": 1.375},
-                {"matrix": [6, 8], "x": 18, "y": 1.375},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.375},
-                {"matrix": [2, 4], "x": 1, "y": 2.375},
-                {"matrix": [2, 3], "x": 2, "y": 2.125},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2.125},
-                {"matrix": [2, 0], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
-                {"matrix": [7, 1], "x": 10.75, "y": 2.125},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2.125},
-                {"matrix": [7, 4], "x": 13.75, "y": 2.375},
-                {"matrix": [7, 5], "x": 14.75, "y": 2.375},
-
-                {"matrix": [7, 7], "x": 17, "y": 2.375},
-
-                {"matrix": [3, 5], "x": 0, "y": 3.375},
-                {"matrix": [3, 4], "x": 1, "y": 3.375},
-                {"matrix": [3, 3], "x": 2, "y": 3.125},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 1], "x": 4, "y": 3.125},
-                {"matrix": [3, 0], "x": 5, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 3.125},
-                {"matrix": [8, 2], "x": 11.75, "y": 3},
-                {"matrix": [8, 3], "x": 12.75, "y": 3.125},
-                {"matrix": [8, 4], "x": 13.75, "y": 3.375},
-                {"matrix": [8, 5], "x": 14.75, "y": 3.375},
-
-                {"matrix": [8, 6], "x": 16, "y": 3.375},
-                {"matrix": [8, 7], "x": 17, "y": 3.375},
-                {"matrix": [8, 8], "x": 18, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
-                {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
-
-                {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
-                {"matrix": [9, 1], "x": 10.25, "y": 4.5},
-                {"matrix": [9, 2], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 12.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/afternoonlabs/breeze/rev1/keyboard.json b/keyboards/afternoonlabs/breeze/rev1/keyboard.json
new file mode 100644
index 00000000000..ccb13551c10
--- /dev/null
+++ b/keyboards/afternoonlabs/breeze/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Breeze",
+    "manufacturer": "AfternoonLabs",
+    "url": "afternoonlabs.com/breeze",
+    "maintainer": "eithanshavit",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0.375},
+                {"matrix": [0, 4], "x": 1, "y": 0.375},
+                {"matrix": [0, 3], "x": 2, "y": 0.125},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0.125},
+                {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 0], "x": 9.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 10.75, "y": 0.125},
+                {"matrix": [5, 2], "x": 11.75, "y": 0},
+                {"matrix": [5, 3], "x": 12.75, "y": 0.125},
+                {"matrix": [5, 4], "x": 13.75, "y": 0.375},
+                {"matrix": [5, 5], "x": 14.75, "y": 0.375},
+
+                {"matrix": [5, 6], "x": 16, "y": 0.375},
+                {"matrix": [5, 7], "x": 17, "y": 0.375},
+                {"matrix": [5, 8], "x": 18, "y": 0.375},
+
+                {"matrix": [1, 5], "x": 0, "y": 1.375},
+                {"matrix": [1, 4], "x": 1, "y": 1.375},
+                {"matrix": [1, 3], "x": 2, "y": 1.125},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1.125},
+                {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 10.75, "y": 1.125},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 3], "x": 12.75, "y": 1.125},
+                {"matrix": [6, 4], "x": 13.75, "y": 1.375},
+                {"matrix": [6, 5], "x": 14.75, "y": 1.375},
+
+                {"matrix": [6, 6], "x": 16, "y": 1.375},
+                {"matrix": [6, 7], "x": 17, "y": 1.375},
+                {"matrix": [6, 8], "x": 18, "y": 1.375},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.375},
+                {"matrix": [2, 4], "x": 1, "y": 2.375},
+                {"matrix": [2, 3], "x": 2, "y": 2.125},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2.125},
+                {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.125},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.125},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.375},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.375},
+
+                {"matrix": [7, 7], "x": 17, "y": 2.375},
+
+                {"matrix": [3, 5], "x": 0, "y": 3.375},
+                {"matrix": [3, 4], "x": 1, "y": 3.375},
+                {"matrix": [3, 3], "x": 2, "y": 3.125},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3.125},
+                {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.125},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.125},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.375},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.375},
+
+                {"matrix": [8, 6], "x": 16, "y": 3.375},
+                {"matrix": [8, 7], "x": 17, "y": 3.375},
+                {"matrix": [8, 8], "x": 18, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+                {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30},
+
+                {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30},
+                {"matrix": [9, 1], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk
deleted file mode 100644
index 151c93f7796..00000000000
--- a/keyboards/afternoonlabs/breeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
-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 = 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/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
deleted file mode 100644
index 44f7fa7006a..00000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "keyboard_name": "OceanBreeze",
-    "manufacturer": "AfternoonLabs",
-    "url": "afternoonlabs.com",
-    "maintainer": "afternoonlabs",
-    "usb": {
-        "vid": "0x616C",
-        "pid": "0x0003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0.375},
-                {"matrix": [0, 4], "x": 1, "y": 0.375},
-                {"matrix": [0, 3], "x": 2, "y": 0.125},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0.125},
-                {"matrix": [0, 0], "x": 5, "y": 0.25},
-
-                {"matrix": [6, 0], "x": 9.75, "y": 0.25},
-                {"matrix": [6, 1], "x": 10.75, "y": 0.125},
-                {"matrix": [6, 2], "x": 11.75, "y": 0},
-                {"matrix": [6, 3], "x": 12.75, "y": 0.125},
-                {"matrix": [6, 4], "x": 13.75, "y": 0.375},
-                {"matrix": [6, 5], "x": 14.75, "y": 0.375},
-
-                {"matrix": [6, 6], "x": 16, "y": 0.375},
-                {"matrix": [6, 7], "x": 17, "y": 0.375},
-                {"matrix": [6, 8], "x": 18, "y": 0.375},
-
-                {"matrix": [1, 5], "x": 0, "y": 1.375},
-                {"matrix": [1, 4], "x": 1, "y": 1.375},
-                {"matrix": [1, 3], "x": 2, "y": 1.125},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1.125},
-                {"matrix": [1, 0], "x": 5, "y": 1.25},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 1.25},
-                {"matrix": [7, 1], "x": 10.75, "y": 1.125},
-                {"matrix": [7, 2], "x": 11.75, "y": 1},
-                {"matrix": [7, 3], "x": 12.75, "y": 1.125},
-                {"matrix": [7, 4], "x": 13.75, "y": 1.375},
-                {"matrix": [7, 5], "x": 14.75, "y": 1.375},
-
-                {"matrix": [7, 6], "x": 16, "y": 1.375},
-                {"matrix": [7, 7], "x": 17, "y": 1.375},
-                {"matrix": [7, 8], "x": 18, "y": 1.375},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.375},
-                {"matrix": [2, 4], "x": 1, "y": 2.375},
-                {"matrix": [2, 3], "x": 2, "y": 2.125},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2.125},
-                {"matrix": [2, 0], "x": 5, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 9.75, "y": 2.25},
-                {"matrix": [8, 1], "x": 10.75, "y": 2.125},
-                {"matrix": [8, 2], "x": 11.75, "y": 2},
-                {"matrix": [8, 3], "x": 12.75, "y": 2.125},
-                {"matrix": [8, 4], "x": 13.75, "y": 2.375},
-                {"matrix": [8, 5], "x": 14.75, "y": 2.375},
-
-                {"matrix": [8, 7], "x": 17, "y": 2.375},
-
-                {"matrix": [3, 5], "x": 0, "y": 3.375},
-                {"matrix": [3, 4], "x": 1, "y": 3.375},
-                {"matrix": [3, 3], "x": 2, "y": 3.125},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 1], "x": 4, "y": 3.125},
-                {"matrix": [3, 0], "x": 5, "y": 3.25},
-
-                {"matrix": [5, 0], "x": 6.25, "y": 3.75},
-
-                {"matrix": [11, 0], "x": 8.5, "y": 3.75},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 3.25},
-                {"matrix": [9, 1], "x": 10.75, "y": 3.125},
-                {"matrix": [9, 2], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3.125},
-                {"matrix": [9, 4], "x": 13.75, "y": 3.375},
-                {"matrix": [9, 5], "x": 14.75, "y": 3.375},
-
-                {"matrix": [9, 6], "x": 16, "y": 3.375},
-                {"matrix": [9, 7], "x": 17, "y": 3.375},
-                {"matrix": [9, 8], "x": 18, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
-                {"matrix": [4, 0], "x": 6.25, "y": 4.75},
-
-                {"matrix": [10, 0], "x": 8.5, "y": 4.75},
-                {"matrix": [10, 1], "x": 10.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 11.25, "y": 4.25},
-                {"matrix": [10, 3], "x": 12.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json
new file mode 100644
index 00000000000..2a80a0bc2bd
--- /dev/null
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "OceanBreeze",
+    "manufacturer": "AfternoonLabs",
+    "url": "afternoonlabs.com",
+    "maintainer": "afternoonlabs",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0.375},
+                {"matrix": [0, 4], "x": 1, "y": 0.375},
+                {"matrix": [0, 3], "x": 2, "y": 0.125},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0.125},
+                {"matrix": [0, 0], "x": 5, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 9.75, "y": 0.25},
+                {"matrix": [6, 1], "x": 10.75, "y": 0.125},
+                {"matrix": [6, 2], "x": 11.75, "y": 0},
+                {"matrix": [6, 3], "x": 12.75, "y": 0.125},
+                {"matrix": [6, 4], "x": 13.75, "y": 0.375},
+                {"matrix": [6, 5], "x": 14.75, "y": 0.375},
+
+                {"matrix": [6, 6], "x": 16, "y": 0.375},
+                {"matrix": [6, 7], "x": 17, "y": 0.375},
+                {"matrix": [6, 8], "x": 18, "y": 0.375},
+
+                {"matrix": [1, 5], "x": 0, "y": 1.375},
+                {"matrix": [1, 4], "x": 1, "y": 1.375},
+                {"matrix": [1, 3], "x": 2, "y": 1.125},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1.125},
+                {"matrix": [1, 0], "x": 5, "y": 1.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 1.125},
+                {"matrix": [7, 2], "x": 11.75, "y": 1},
+                {"matrix": [7, 3], "x": 12.75, "y": 1.125},
+                {"matrix": [7, 4], "x": 13.75, "y": 1.375},
+                {"matrix": [7, 5], "x": 14.75, "y": 1.375},
+
+                {"matrix": [7, 6], "x": 16, "y": 1.375},
+                {"matrix": [7, 7], "x": 17, "y": 1.375},
+                {"matrix": [7, 8], "x": 18, "y": 1.375},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.375},
+                {"matrix": [2, 4], "x": 1, "y": 2.375},
+                {"matrix": [2, 3], "x": 2, "y": 2.125},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2.125},
+                {"matrix": [2, 0], "x": 5, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 2.125},
+                {"matrix": [8, 2], "x": 11.75, "y": 2},
+                {"matrix": [8, 3], "x": 12.75, "y": 2.125},
+                {"matrix": [8, 4], "x": 13.75, "y": 2.375},
+                {"matrix": [8, 5], "x": 14.75, "y": 2.375},
+
+                {"matrix": [8, 7], "x": 17, "y": 2.375},
+
+                {"matrix": [3, 5], "x": 0, "y": 3.375},
+                {"matrix": [3, 4], "x": 1, "y": 3.375},
+                {"matrix": [3, 3], "x": 2, "y": 3.125},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3.125},
+                {"matrix": [3, 0], "x": 5, "y": 3.25},
+
+                {"matrix": [5, 0], "x": 6.25, "y": 3.75},
+
+                {"matrix": [11, 0], "x": 8.5, "y": 3.75},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.125},
+                {"matrix": [9, 2], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.125},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.375},
+                {"matrix": [9, 5], "x": 14.75, "y": 3.375},
+
+                {"matrix": [9, 6], "x": 16, "y": 3.375},
+                {"matrix": [9, 7], "x": 17, "y": 3.375},
+                {"matrix": [9, 8], "x": 18, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.5},
+                {"matrix": [4, 0], "x": 6.25, "y": 4.75},
+
+                {"matrix": [10, 0], "x": 8.5, "y": 4.75},
+                {"matrix": [10, 1], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 11.25, "y": 4.25},
+                {"matrix": [10, 3], "x": 12.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
deleted file mode 100644
index 904c6b60cbd..00000000000
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
deleted file mode 100644
index c71feef8ba0..00000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Southern Breeze",
-    "manufacturer": "AfternoonLabs",
-    "url": "afternoonlabs.com/breeze",
-    "maintainer": "eithanshavit",
-    "usb": {
-        "vid": "0x616C",
-        "pid": "0x0005",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 8], "x": 0, "y": 0.375},
-                {"matrix": [0, 7], "x": 1, "y": 0.375},
-                {"matrix": [0, 6], "x": 2, "y": 0.375},
-
-                {"matrix": [0, 5], "x": 3.25, "y": 0.375},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.375},
-                {"matrix": [0, 3], "x": 5.25, "y": 0.125},
-                {"matrix": [0, 2], "x": 6.25, "y": 0},
-                {"matrix": [0, 1], "x": 7.25, "y": 0.125},
-                {"matrix": [0, 0], "x": 8.25, "y": 0.25},
-
-                {"matrix": [5, 0], "x": 13, "y": 0.25},
-                {"matrix": [5, 1], "x": 14, "y": 0.125},
-                {"matrix": [5, 2], "x": 15, "y": 0},
-                {"matrix": [5, 3], "x": 16, "y": 0.125},
-                {"matrix": [5, 4], "x": 17, "y": 0.375},
-                {"matrix": [5, 5], "x": 18, "y": 0.375},
-
-                {"matrix": [1, 8], "x": 0, "y": 1.375},
-                {"matrix": [1, 7], "x": 1, "y": 1.375},
-                {"matrix": [1, 6], "x": 2, "y": 1.375},
-
-                {"matrix": [1, 5], "x": 3.25, "y": 1.375},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.375},
-                {"matrix": [1, 3], "x": 5.25, "y": 1.125},
-                {"matrix": [1, 2], "x": 6.25, "y": 1},
-                {"matrix": [1, 1], "x": 7.25, "y": 1.125},
-                {"matrix": [1, 0], "x": 8.25, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 13, "y": 1.25},
-                {"matrix": [6, 1], "x": 14, "y": 1.125},
-                {"matrix": [6, 2], "x": 15, "y": 1},
-                {"matrix": [6, 3], "x": 16, "y": 1.125},
-                {"matrix": [6, 4], "x": 17, "y": 1.375},
-                {"matrix": [6, 5], "x": 18, "y": 1.375},
-
-                {"matrix": [2, 7], "x": 1, "y": 2.375},
-
-                {"matrix": [2, 5], "x": 3.25, "y": 2.375},
-                {"matrix": [2, 4], "x": 4.25, "y": 2.375},
-                {"matrix": [2, 3], "x": 5.25, "y": 2.125},
-                {"matrix": [2, 2], "x": 6.25, "y": 2},
-                {"matrix": [2, 1], "x": 7.25, "y": 2.125},
-                {"matrix": [2, 0], "x": 8.25, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 13, "y": 2.25},
-                {"matrix": [7, 1], "x": 14, "y": 2.125},
-                {"matrix": [7, 2], "x": 15, "y": 2},
-                {"matrix": [7, 3], "x": 16, "y": 2.125},
-                {"matrix": [7, 4], "x": 17, "y": 2.375},
-                {"matrix": [7, 5], "x": 18, "y": 2.375},
-
-                {"matrix": [3, 8], "x": 0, "y": 3.375},
-                {"matrix": [3, 7], "x": 1, "y": 3.375},
-                {"matrix": [3, 6], "x": 2, "y": 3.375},
-
-                {"matrix": [3, 5], "x": 3.25, "y": 3.375},
-                {"matrix": [3, 4], "x": 4.25, "y": 3.375},
-                {"matrix": [3, 3], "x": 5.25, "y": 3.125},
-                {"matrix": [3, 2], "x": 6.25, "y": 3},
-                {"matrix": [3, 1], "x": 7.25, "y": 3.125},
-                {"matrix": [3, 0], "x": 8.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 13, "y": 3.25},
-                {"matrix": [8, 1], "x": 14, "y": 3.125},
-                {"matrix": [8, 2], "x": 15, "y": 3},
-                {"matrix": [8, 3], "x": 16, "y": 3.125},
-                {"matrix": [8, 4], "x": 17, "y": 3.375},
-                {"matrix": [8, 5], "x": 18, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 2], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 1], "x": 7.75, "y": 4.5},
-                {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
-
-                {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
-                {"matrix": [9, 1], "x": 13.5, "y": 4.5},
-                {"matrix": [9, 2], "x": 14.5, "y": 4.25},
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json
new file mode 100644
index 00000000000..c4d38a7a69e
--- /dev/null
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Southern Breeze",
+    "manufacturer": "AfternoonLabs",
+    "url": "afternoonlabs.com/breeze",
+    "maintainer": "eithanshavit",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 8], "x": 0, "y": 0.375},
+                {"matrix": [0, 7], "x": 1, "y": 0.375},
+                {"matrix": [0, 6], "x": 2, "y": 0.375},
+
+                {"matrix": [0, 5], "x": 3.25, "y": 0.375},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.375},
+                {"matrix": [0, 3], "x": 5.25, "y": 0.125},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0.125},
+                {"matrix": [0, 0], "x": 8.25, "y": 0.25},
+
+                {"matrix": [5, 0], "x": 13, "y": 0.25},
+                {"matrix": [5, 1], "x": 14, "y": 0.125},
+                {"matrix": [5, 2], "x": 15, "y": 0},
+                {"matrix": [5, 3], "x": 16, "y": 0.125},
+                {"matrix": [5, 4], "x": 17, "y": 0.375},
+                {"matrix": [5, 5], "x": 18, "y": 0.375},
+
+                {"matrix": [1, 8], "x": 0, "y": 1.375},
+                {"matrix": [1, 7], "x": 1, "y": 1.375},
+                {"matrix": [1, 6], "x": 2, "y": 1.375},
+
+                {"matrix": [1, 5], "x": 3.25, "y": 1.375},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.375},
+                {"matrix": [1, 3], "x": 5.25, "y": 1.125},
+                {"matrix": [1, 2], "x": 6.25, "y": 1},
+                {"matrix": [1, 1], "x": 7.25, "y": 1.125},
+                {"matrix": [1, 0], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 13, "y": 1.25},
+                {"matrix": [6, 1], "x": 14, "y": 1.125},
+                {"matrix": [6, 2], "x": 15, "y": 1},
+                {"matrix": [6, 3], "x": 16, "y": 1.125},
+                {"matrix": [6, 4], "x": 17, "y": 1.375},
+                {"matrix": [6, 5], "x": 18, "y": 1.375},
+
+                {"matrix": [2, 7], "x": 1, "y": 2.375},
+
+                {"matrix": [2, 5], "x": 3.25, "y": 2.375},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.375},
+                {"matrix": [2, 3], "x": 5.25, "y": 2.125},
+                {"matrix": [2, 2], "x": 6.25, "y": 2},
+                {"matrix": [2, 1], "x": 7.25, "y": 2.125},
+                {"matrix": [2, 0], "x": 8.25, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 13, "y": 2.25},
+                {"matrix": [7, 1], "x": 14, "y": 2.125},
+                {"matrix": [7, 2], "x": 15, "y": 2},
+                {"matrix": [7, 3], "x": 16, "y": 2.125},
+                {"matrix": [7, 4], "x": 17, "y": 2.375},
+                {"matrix": [7, 5], "x": 18, "y": 2.375},
+
+                {"matrix": [3, 8], "x": 0, "y": 3.375},
+                {"matrix": [3, 7], "x": 1, "y": 3.375},
+                {"matrix": [3, 6], "x": 2, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 3.25, "y": 3.375},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.375},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.125},
+                {"matrix": [3, 2], "x": 6.25, "y": 3},
+                {"matrix": [3, 1], "x": 7.25, "y": 3.125},
+                {"matrix": [3, 0], "x": 8.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 13, "y": 3.25},
+                {"matrix": [8, 1], "x": 14, "y": 3.125},
+                {"matrix": [8, 2], "x": 15, "y": 3},
+                {"matrix": [8, 3], "x": 16, "y": 3.125},
+                {"matrix": [8, 4], "x": 17, "y": 3.375},
+                {"matrix": [8, 5], "x": 18, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 1], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
+                {"matrix": [9, 1], "x": 13.5, "y": 4.5},
+                {"matrix": [9, 2], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk
deleted file mode 100644
index 7b63c0c2988..00000000000
--- a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk
+++ /dev/null
@@ -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       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
deleted file mode 100644
index 4ec3db219cd..00000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "Summer Breeze",
-    "manufacturer": "AfternoonLabs",
-    "url": "afternoonlabs.com/breeze",
-    "maintainer": "eithanshavit",
-    "usb": {
-        "vid": "0x616C",
-        "pid": "0x0004",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "bootmagic": {
-        "matrix": [0, 5]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 8], "x": 0, "y": 0.375},
-                {"matrix": [0, 7], "x": 1, "y": 0.375},
-                {"matrix": [0, 6], "x": 2, "y": 0.375},
-
-                {"matrix": [0, 5], "x": 3.25, "y": 0.375},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.375},
-                {"matrix": [0, 3], "x": 5.25, "y": 0.125},
-                {"matrix": [0, 2], "x": 6.25, "y": 0},
-                {"matrix": [0, 1], "x": 7.25, "y": 0.125},
-                {"matrix": [0, 0], "x": 8.25, "y": 0.25},
-
-                {"matrix": [5, 0], "x": 13, "y": 0.25},
-                {"matrix": [5, 1], "x": 14, "y": 0.125},
-                {"matrix": [5, 2], "x": 15, "y": 0},
-                {"matrix": [5, 3], "x": 16, "y": 0.125},
-                {"matrix": [5, 4], "x": 17, "y": 0.375},
-                {"matrix": [5, 5], "x": 18, "y": 0.375},
-
-                {"matrix": [5, 6], "x": 19.25, "y": 0.375},
-                {"matrix": [5, 7], "x": 20.25, "y": 0.375},
-                {"matrix": [5, 8], "x": 21.25, "y": 0.375},
-
-                {"matrix": [1, 8], "x": 0, "y": 1.375},
-                {"matrix": [1, 7], "x": 1, "y": 1.375},
-                {"matrix": [1, 6], "x": 2, "y": 1.375},
-
-                {"matrix": [1, 5], "x": 3.25, "y": 1.375},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.375},
-                {"matrix": [1, 3], "x": 5.25, "y": 1.125},
-                {"matrix": [1, 2], "x": 6.25, "y": 1},
-                {"matrix": [1, 1], "x": 7.25, "y": 1.125},
-                {"matrix": [1, 0], "x": 8.25, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 13, "y": 1.25},
-                {"matrix": [6, 1], "x": 14, "y": 1.125},
-                {"matrix": [6, 2], "x": 15, "y": 1},
-                {"matrix": [6, 3], "x": 16, "y": 1.125},
-                {"matrix": [6, 4], "x": 17, "y": 1.375},
-                {"matrix": [6, 5], "x": 18, "y": 1.375},
-
-                {"matrix": [6, 6], "x": 19.25, "y": 1.375},
-                {"matrix": [6, 7], "x": 20.25, "y": 1.375},
-                {"matrix": [6, 8], "x": 21.25, "y": 1.375},
-
-                {"matrix": [2, 7], "x": 1, "y": 2.375},
-
-                {"matrix": [2, 5], "x": 3.25, "y": 2.375},
-                {"matrix": [2, 4], "x": 4.25, "y": 2.375},
-                {"matrix": [2, 3], "x": 5.25, "y": 2.125},
-                {"matrix": [2, 2], "x": 6.25, "y": 2},
-                {"matrix": [2, 1], "x": 7.25, "y": 2.125},
-                {"matrix": [2, 0], "x": 8.25, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 13, "y": 2.25},
-                {"matrix": [7, 1], "x": 14, "y": 2.125},
-                {"matrix": [7, 2], "x": 15, "y": 2},
-                {"matrix": [7, 3], "x": 16, "y": 2.125},
-                {"matrix": [7, 4], "x": 17, "y": 2.375},
-                {"matrix": [7, 5], "x": 18, "y": 2.375},
-
-                {"matrix": [7, 7], "x": 20.25, "y": 2.375},
-
-                {"matrix": [3, 8], "x": 0, "y": 3.375},
-                {"matrix": [3, 7], "x": 1, "y": 3.375},
-                {"matrix": [3, 6], "x": 2, "y": 3.375},
-
-                {"matrix": [3, 5], "x": 3.25, "y": 3.375},
-                {"matrix": [3, 4], "x": 4.25, "y": 3.375},
-                {"matrix": [3, 3], "x": 5.25, "y": 3.125},
-                {"matrix": [3, 2], "x": 6.25, "y": 3},
-                {"matrix": [3, 1], "x": 7.25, "y": 3.125},
-                {"matrix": [3, 0], "x": 8.25, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 13, "y": 3.25},
-                {"matrix": [8, 1], "x": 14, "y": 3.125},
-                {"matrix": [8, 2], "x": 15, "y": 3},
-                {"matrix": [8, 3], "x": 16, "y": 3.125},
-                {"matrix": [8, 4], "x": 17, "y": 3.375},
-                {"matrix": [8, 5], "x": 18, "y": 3.375},
-
-                {"matrix": [8, 6], "x": 19.25, "y": 3.375},
-                {"matrix": [8, 7], "x": 20.25, "y": 3.375},
-                {"matrix": [8, 8], "x": 21.25, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 2], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 1], "x": 7.75, "y": 4.5},
-                {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
-
-                {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
-                {"matrix": [9, 1], "x": 13.5, "y": 4.5},
-                {"matrix": [9, 2], "x": 14.5, "y": 4.25},
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json
new file mode 100644
index 00000000000..702a942a3cf
--- /dev/null
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json
@@ -0,0 +1,130 @@
+{
+    "keyboard_name": "Summer Breeze",
+    "manufacturer": "AfternoonLabs",
+    "url": "afternoonlabs.com/breeze",
+    "maintainer": "eithanshavit",
+    "usb": {
+        "vid": "0x616C",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 8], "x": 0, "y": 0.375},
+                {"matrix": [0, 7], "x": 1, "y": 0.375},
+                {"matrix": [0, 6], "x": 2, "y": 0.375},
+
+                {"matrix": [0, 5], "x": 3.25, "y": 0.375},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.375},
+                {"matrix": [0, 3], "x": 5.25, "y": 0.125},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0.125},
+                {"matrix": [0, 0], "x": 8.25, "y": 0.25},
+
+                {"matrix": [5, 0], "x": 13, "y": 0.25},
+                {"matrix": [5, 1], "x": 14, "y": 0.125},
+                {"matrix": [5, 2], "x": 15, "y": 0},
+                {"matrix": [5, 3], "x": 16, "y": 0.125},
+                {"matrix": [5, 4], "x": 17, "y": 0.375},
+                {"matrix": [5, 5], "x": 18, "y": 0.375},
+
+                {"matrix": [5, 6], "x": 19.25, "y": 0.375},
+                {"matrix": [5, 7], "x": 20.25, "y": 0.375},
+                {"matrix": [5, 8], "x": 21.25, "y": 0.375},
+
+                {"matrix": [1, 8], "x": 0, "y": 1.375},
+                {"matrix": [1, 7], "x": 1, "y": 1.375},
+                {"matrix": [1, 6], "x": 2, "y": 1.375},
+
+                {"matrix": [1, 5], "x": 3.25, "y": 1.375},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.375},
+                {"matrix": [1, 3], "x": 5.25, "y": 1.125},
+                {"matrix": [1, 2], "x": 6.25, "y": 1},
+                {"matrix": [1, 1], "x": 7.25, "y": 1.125},
+                {"matrix": [1, 0], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 13, "y": 1.25},
+                {"matrix": [6, 1], "x": 14, "y": 1.125},
+                {"matrix": [6, 2], "x": 15, "y": 1},
+                {"matrix": [6, 3], "x": 16, "y": 1.125},
+                {"matrix": [6, 4], "x": 17, "y": 1.375},
+                {"matrix": [6, 5], "x": 18, "y": 1.375},
+
+                {"matrix": [6, 6], "x": 19.25, "y": 1.375},
+                {"matrix": [6, 7], "x": 20.25, "y": 1.375},
+                {"matrix": [6, 8], "x": 21.25, "y": 1.375},
+
+                {"matrix": [2, 7], "x": 1, "y": 2.375},
+
+                {"matrix": [2, 5], "x": 3.25, "y": 2.375},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.375},
+                {"matrix": [2, 3], "x": 5.25, "y": 2.125},
+                {"matrix": [2, 2], "x": 6.25, "y": 2},
+                {"matrix": [2, 1], "x": 7.25, "y": 2.125},
+                {"matrix": [2, 0], "x": 8.25, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 13, "y": 2.25},
+                {"matrix": [7, 1], "x": 14, "y": 2.125},
+                {"matrix": [7, 2], "x": 15, "y": 2},
+                {"matrix": [7, 3], "x": 16, "y": 2.125},
+                {"matrix": [7, 4], "x": 17, "y": 2.375},
+                {"matrix": [7, 5], "x": 18, "y": 2.375},
+
+                {"matrix": [7, 7], "x": 20.25, "y": 2.375},
+
+                {"matrix": [3, 8], "x": 0, "y": 3.375},
+                {"matrix": [3, 7], "x": 1, "y": 3.375},
+                {"matrix": [3, 6], "x": 2, "y": 3.375},
+
+                {"matrix": [3, 5], "x": 3.25, "y": 3.375},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.375},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.125},
+                {"matrix": [3, 2], "x": 6.25, "y": 3},
+                {"matrix": [3, 1], "x": 7.25, "y": 3.125},
+                {"matrix": [3, 0], "x": 8.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 13, "y": 3.25},
+                {"matrix": [8, 1], "x": 14, "y": 3.125},
+                {"matrix": [8, 2], "x": 15, "y": 3},
+                {"matrix": [8, 3], "x": 16, "y": 3.125},
+                {"matrix": [8, 4], "x": 17, "y": 3.375},
+                {"matrix": [8, 5], "x": 18, "y": 3.375},
+
+                {"matrix": [8, 6], "x": 19.25, "y": 3.375},
+                {"matrix": [8, 7], "x": 20.25, "y": 3.375},
+                {"matrix": [8, 8], "x": 21.25, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 1], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30},
+                {"matrix": [9, 1], "x": 13.5, "y": 4.5},
+                {"matrix": [9, 2], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk
deleted file mode 100644
index 7b63c0c2988..00000000000
--- a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk
+++ /dev/null
@@ -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       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
deleted file mode 100644
index 056f54d5212..00000000000
--- a/keyboards/ai03/andromeda/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Andrew Kannan
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ai03/andromeda/keyboard.json b/keyboards/ai03/andromeda/keyboard.json
index 5a9bf32ef15..d085b91ad17 100644
--- a/keyboards/ai03/andromeda/keyboard.json
+++ b/keyboards/ai03/andromeda/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"],
         "rows": ["B4", "B3", "A15", "A3", "A4", "A5"]
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/ai03/equinox/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json
index 2912f0c1d83..7c2cc465005 100644
--- a/keyboards/ai03/equinox/info.json
+++ b/keyboards/ai03/equinox/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
deleted file mode 100644
index 9fe6627ecc1..00000000000
--- a/keyboards/ai03/jp60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 ai03
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/jp60/keyboard.json b/keyboards/ai03/jp60/keyboard.json
index bc366e60e50..389993626d8 100644
--- a/keyboards/ai03/jp60/keyboard.json
+++ b/keyboards/ai03/jp60/keyboard.json
@@ -19,6 +19,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"],
         "rows": ["B6", "B5", "B4", "D7", "E6"]
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/ai03/lunar/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/lunar/keyboard.json b/keyboards/ai03/lunar/keyboard.json
index 8a5bc145765..00ff761d3f8 100644
--- a/keyboards/ai03/lunar/keyboard.json
+++ b/keyboards/ai03/lunar/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["B3", "D0", "D1", "D2", "D3"]
diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h
index 1b02059356a..07dde6cb899 100644
--- a/keyboards/ai03/lunar_ii/config.h
+++ b/keyboards/ai03/lunar_ii/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Mechanical lock switch support */
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
 /* Solenoid support */
 #define SOLENOID_PIN B7
 #define SOLENOID_DEFAULT_DWELL 15
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
deleted file mode 100644
index ee7f1527586..00000000000
--- a/keyboards/ai03/lunar_ii/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Lunar II",
-    "manufacturer": "ai03 Design Studio",
-    "url": "https://ai03.com/projects/lunar-ii",
-    "maintainer": "ai03-2725",
-    "usb": {
-        "vid": "0xA103",
-        "pid": "0x0016",
-        "device_version": "1.0.0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "rows": ["D0", "D1", "D2", "F0", "F1"],
-        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
-    },
-    "indicators": {
-        "caps_lock": "B3",
-        "on_state": 0
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "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": [2, 12], "x": 14, "y": 0},
-                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"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], "w": 2.25, "x": 12.75, "y": 2},
-                {"matrix": [3, 0], "w": 2.25, "x": 0, "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], "w": 2.75, "x": 12.25, "y": 3},
-                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4},
-                {"matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4},
-                {"matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4},
-                {"matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4},
-                {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ai03/lunar_ii/keyboard.json b/keyboards/ai03/lunar_ii/keyboard.json
new file mode 100644
index 00000000000..38729595a29
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Lunar II",
+    "manufacturer": "ai03 Design Studio",
+    "url": "https://ai03.com/projects/lunar-ii",
+    "maintainer": "ai03-2725",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0016",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "haptic": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["D0", "D1", "D2", "F0", "F1"],
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "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": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "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], "w": 2.75, "x": 12.25, "y": 3},
+                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4},
+                {"matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4},
+                {"matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4},
+                {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
index 7ad594e1f9f..a521203b326 100644
--- a/keyboards/ai03/lunar_ii/rules.mk
+++ b/keyboards/ai03/lunar_ii/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-HAPTIC_ENABLE = yes         # Enable solenoid support
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 53a057875f9..f3a4ae2db34 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
deleted file mode 100644
index d7ff0b786cc..00000000000
--- a/keyboards/ai03/orbit/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "Orbit",
-    "manufacturer": "ai03 Keyboard Designs",
-    "url": "https://github.com/ai03-2725/Orbit",
-    "maintainer": "ai03",
-    "usb": {
-        "vid": "0xA103",
-        "pid": "0x0003",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
-        "rows": ["F7", "F6", "F5", "F4", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
-                "rows": ["B6", "B5", "B4", "D7", "E6"]
-            }
-        },
-        "transport":{
-            "sync" :{
-                "indicators": true,
-                "layer_state": true
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.63},
-                {"matrix": [0, 1], "x": 1, "y": 0.38},
-                {"matrix": [0, 2], "x": 2, "y": 0.38},
-                {"matrix": [0, 3], "x": 3, "y": 0.13},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0.13},
-                {"matrix": [0, 6], "x": 6, "y": 0.25},
-
-                {"matrix": [5, 0], "x": 9, "y": 0.25},
-                {"matrix": [5, 1], "x": 10, "y": 0.13},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0.13},
-                {"matrix": [5, 4], "x": 13, "y": 0.38},
-                {"matrix": [5, 5], "x": 14, "y": 0.38},
-                {"matrix": [5, 6], "x": 15, "y": 0.63},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.63},
-                {"matrix": [1, 1], "x": 1, "y": 1.38},
-                {"matrix": [1, 2], "x": 2, "y": 1.38},
-                {"matrix": [1, 3], "x": 3, "y": 1.13},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1.13},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-
-                {"matrix": [6, 0], "x": 9, "y": 1.25},
-                {"matrix": [6, 1], "x": 10, "y": 1.13},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1.13},
-                {"matrix": [6, 4], "x": 13, "y": 1.38},
-                {"matrix": [6, 5], "x": 14, "y": 1.38},
-                {"matrix": [6, 6], "x": 15, "y": 1.63},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.63},
-                {"matrix": [2, 1], "x": 1, "y": 2.38},
-                {"matrix": [2, 2], "x": 2, "y": 2.38},
-                {"matrix": [2, 3], "x": 3, "y": 2.13},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2.13},
-                {"matrix": [2, 6], "x": 6, "y": 2.25},
-
-                {"matrix": [7, 0], "x": 9, "y": 2.25},
-                {"matrix": [7, 1], "x": 10, "y": 2.13},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2.13},
-                {"matrix": [7, 4], "x": 13, "y": 2.38},
-                {"matrix": [7, 5], "x": 14, "y": 2.38},
-                {"matrix": [7, 6], "x": 15, "y": 2.63},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.63},
-                {"matrix": [3, 1], "x": 1, "y": 3.38},
-                {"matrix": [3, 2], "x": 2, "y": 3.38},
-                {"matrix": [3, 3], "x": 3, "y": 3.13},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3.13},
-                {"matrix": [3, 6], "x": 6, "y": 3.25},
-
-                {"matrix": [8, 0], "x": 9, "y": 3.25},
-                {"matrix": [8, 1], "x": 10, "y": 3.13},
-                {"matrix": [8, 2], "x": 11, "y": 3},
-                {"matrix": [8, 3], "x": 12, "y": 3.13},
-                {"matrix": [8, 4], "x": 13, "y": 3.38},
-                {"matrix": [8, 5], "x": 14, "y": 3.38},
-                {"matrix": [8, 6], "x": 15, "y": 3.63},
-
-                {"matrix": [4, 1], "x": 1, "y": 4.38},
-                {"matrix": [4, 2], "x": 2, "y": 4.38},
-                {"matrix": [4, 3], "x": 3, "y": 4.13},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5},
-
-                {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5},
-                {"matrix": [9, 1], "x": 9.5, "y": 4.25},
-                {"matrix": [9, 2], "x": 11, "y": 4},
-                {"matrix": [9, 3], "x": 12, "y": 4.13},
-                {"matrix": [9, 4], "x": 13, "y": 4.38},
-                {"matrix": [9, 5], "x": 14, "y": 4.38}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ai03/orbit/keyboard.json b/keyboards/ai03/orbit/keyboard.json
new file mode 100644
index 00000000000..ec308028120
--- /dev/null
+++ b/keyboards/ai03/orbit/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "Orbit",
+    "manufacturer": "ai03 Keyboard Designs",
+    "url": "https://github.com/ai03-2725/Orbit",
+    "maintainer": "ai03",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0003",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"],
+        "rows": ["F7", "F6", "F5", "F4", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D6", "F1", "F0", "F4", "F5", "C6"],
+                "rows": ["B6", "B5", "B4", "D7", "E6"]
+            }
+        },
+        "transport":{
+            "sync" :{
+                "indicators": true,
+                "layer_state": true
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.63},
+                {"matrix": [0, 1], "x": 1, "y": 0.38},
+                {"matrix": [0, 2], "x": 2, "y": 0.38},
+                {"matrix": [0, 3], "x": 3, "y": 0.13},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.13},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+
+                {"matrix": [5, 0], "x": 9, "y": 0.25},
+                {"matrix": [5, 1], "x": 10, "y": 0.13},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0.13},
+                {"matrix": [5, 4], "x": 13, "y": 0.38},
+                {"matrix": [5, 5], "x": 14, "y": 0.38},
+                {"matrix": [5, 6], "x": 15, "y": 0.63},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.63},
+                {"matrix": [1, 1], "x": 1, "y": 1.38},
+                {"matrix": [1, 2], "x": 2, "y": 1.38},
+                {"matrix": [1, 3], "x": 3, "y": 1.13},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.13},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 9, "y": 1.25},
+                {"matrix": [6, 1], "x": 10, "y": 1.13},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1.13},
+                {"matrix": [6, 4], "x": 13, "y": 1.38},
+                {"matrix": [6, 5], "x": 14, "y": 1.38},
+                {"matrix": [6, 6], "x": 15, "y": 1.63},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.63},
+                {"matrix": [2, 1], "x": 1, "y": 2.38},
+                {"matrix": [2, 2], "x": 2, "y": 2.38},
+                {"matrix": [2, 3], "x": 3, "y": 2.13},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.13},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9, "y": 2.25},
+                {"matrix": [7, 1], "x": 10, "y": 2.13},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2.13},
+                {"matrix": [7, 4], "x": 13, "y": 2.38},
+                {"matrix": [7, 5], "x": 14, "y": 2.38},
+                {"matrix": [7, 6], "x": 15, "y": 2.63},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.63},
+                {"matrix": [3, 1], "x": 1, "y": 3.38},
+                {"matrix": [3, 2], "x": 2, "y": 3.38},
+                {"matrix": [3, 3], "x": 3, "y": 3.13},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.13},
+                {"matrix": [3, 6], "x": 6, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9, "y": 3.25},
+                {"matrix": [8, 1], "x": 10, "y": 3.13},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3.13},
+                {"matrix": [8, 4], "x": 13, "y": 3.38},
+                {"matrix": [8, 5], "x": 14, "y": 3.38},
+                {"matrix": [8, 6], "x": 15, "y": 3.63},
+
+                {"matrix": [4, 1], "x": 1, "y": 4.38},
+                {"matrix": [4, 2], "x": 2, "y": 4.38},
+                {"matrix": [4, 3], "x": 3, "y": 4.13},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5},
+
+                {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5},
+                {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 12, "y": 4.13},
+                {"matrix": [9, 4], "x": 13, "y": 4.38},
+                {"matrix": [9, 5], "x": 14, "y": 4.38}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk
deleted file mode 100644
index c95da2740d8..00000000000
--- a/keyboards/ai03/orbit/rules.mk
+++ /dev/null
@@ -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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes		# Split keyboard flag disabled as manual edits had to be done to the split common files
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 05d319d030a..2c63852cbeb 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -21,11 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SPLIT_USB_DETECT
 #define SPLIT_USB_TIMEOUT 2500
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
deleted file mode 100644
index ebb11624fe2..00000000000
--- a/keyboards/ai03/orbit_x/info.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    "keyboard_name": "OrbitX",
-    "manufacturer": "ai03 Design Studio",
-    "url": "",
-    "maintainer": "ai03",
-    "usb": {
-        "vid": "0xA103",
-        "pid": "0x0014",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
-        "rows": ["D7", "D6", "D4", "F0"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
-                "rows": ["B5", "D7", "B4", "D4"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.38},
-                {"matrix": [0, 1], "x": 1, "y": 0.38},
-                {"matrix": [0, 2], "x": 2, "y": 0.13},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.13},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [4, 0], "x": 7.5, "y": 0.25},
-                {"matrix": [4, 1], "x": 8.5, "y": 0.13},
-                {"matrix": [4, 2], "x": 9.5, "y": 0},
-                {"matrix": [4, 3], "x": 10.5, "y": 0.13},
-                {"matrix": [4, 4], "x": 11.5, "y": 0.38},
-                {"matrix": [4, 5], "x": 12.5, "y": 0.38},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.38},
-                {"matrix": [1, 1], "x": 1, "y": 1.38},
-                {"matrix": [1, 2], "x": 2, "y": 1.13},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.13},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [5, 0], "x": 7.5, "y": 1.25},
-                {"matrix": [5, 1], "x": 8.5, "y": 1.13},
-                {"matrix": [5, 2], "x": 9.5, "y": 1},
-                {"matrix": [5, 3], "x": 10.5, "y": 1.13},
-                {"matrix": [5, 4], "x": 11.5, "y": 1.38},
-                {"matrix": [5, 5], "x": 12.5, "y": 1.38},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.38},
-                {"matrix": [2, 1], "x": 1, "y": 2.38},
-                {"matrix": [2, 2], "x": 2, "y": 2.13},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.13},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 7.5, "y": 2.25},
-                {"matrix": [6, 1], "x": 8.5, "y": 2.13},
-                {"matrix": [6, 2], "x": 9.5, "y": 2},
-                {"matrix": [6, 3], "x": 10.5, "y": 2.13},
-                {"matrix": [6, 4], "x": 11.5, "y": 2.38},
-                {"matrix": [6, 5], "x": 12.5, "y": 2.38},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.38},
-                {"matrix": [3, 1], "x": 1, "y": 3.38},
-                {"matrix": [3, 2], "x": 2, "y": 3.13},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3.38},
-                {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5},
-
-                {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5},
-                {"matrix": [7, 1], "x": 8.25, "y": 3.38},
-                {"matrix": [7, 2], "x": 9.5, "y": 3},
-                {"matrix": [7, 3], "x": 10.5, "y": 3.13},
-                {"matrix": [7, 4], "x": 11.5, "y": 3.38},
-                {"matrix": [7, 5], "x": 12.5, "y": 3.38}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ai03/orbit_x/keyboard.json b/keyboards/ai03/orbit_x/keyboard.json
new file mode 100644
index 00000000000..edfbbb27969
--- /dev/null
+++ b/keyboards/ai03/orbit_x/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "OrbitX",
+    "manufacturer": "ai03 Design Studio",
+    "url": "",
+    "maintainer": "ai03",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0014",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F6", "B1", "B0", "C7", "C6"],
+        "rows": ["D7", "D6", "D4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["D6", "B6", "B1", "B0", "B3", "B2"],
+                "rows": ["B5", "D7", "B4", "D4"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.38},
+                {"matrix": [0, 1], "x": 1, "y": 0.38},
+                {"matrix": [0, 2], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.13},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [4, 0], "x": 7.5, "y": 0.25},
+                {"matrix": [4, 1], "x": 8.5, "y": 0.13},
+                {"matrix": [4, 2], "x": 9.5, "y": 0},
+                {"matrix": [4, 3], "x": 10.5, "y": 0.13},
+                {"matrix": [4, 4], "x": 11.5, "y": 0.38},
+                {"matrix": [4, 5], "x": 12.5, "y": 0.38},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.38},
+                {"matrix": [1, 1], "x": 1, "y": 1.38},
+                {"matrix": [1, 2], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.13},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 7.5, "y": 1.25},
+                {"matrix": [5, 1], "x": 8.5, "y": 1.13},
+                {"matrix": [5, 2], "x": 9.5, "y": 1},
+                {"matrix": [5, 3], "x": 10.5, "y": 1.13},
+                {"matrix": [5, 4], "x": 11.5, "y": 1.38},
+                {"matrix": [5, 5], "x": 12.5, "y": 1.38},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.38},
+                {"matrix": [2, 1], "x": 1, "y": 2.38},
+                {"matrix": [2, 2], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.13},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [6, 1], "x": 8.5, "y": 2.13},
+                {"matrix": [6, 2], "x": 9.5, "y": 2},
+                {"matrix": [6, 3], "x": 10.5, "y": 2.13},
+                {"matrix": [6, 4], "x": 11.5, "y": 2.38},
+                {"matrix": [6, 5], "x": 12.5, "y": 2.38},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.38},
+                {"matrix": [3, 1], "x": 1, "y": 3.38},
+                {"matrix": [3, 2], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.38},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5},
+
+                {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5},
+                {"matrix": [7, 1], "x": 8.25, "y": 3.38},
+                {"matrix": [7, 2], "x": 9.5, "y": 3},
+                {"matrix": [7, 3], "x": 10.5, "y": 3.13},
+                {"matrix": [7, 4], "x": 11.5, "y": 3.38},
+                {"matrix": [7, 5], "x": 12.5, "y": 3.38}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/orbit_x/rules.mk b/keyboards/ai03/orbit_x/rules.mk
deleted file mode 100644
index 66711e46132..00000000000
--- a/keyboards/ai03/orbit_x/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Split keyboard
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/ai03/polaris/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/polaris/keyboard.json b/keyboards/ai03/polaris/keyboard.json
index 169118a0cf6..decedbab3df 100644
--- a/keyboards/ai03/polaris/keyboard.json
+++ b/keyboards/ai03/polaris/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
         "rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/ai03/quasar/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/quasar/keyboard.json b/keyboards/ai03/quasar/keyboard.json
index b0514f9e9aa..52902e3067a 100644
--- a/keyboards/ai03/quasar/keyboard.json
+++ b/keyboards/ai03/quasar/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"],
         "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"]
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/ai03/soyuz/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/soyuz/keyboard.json b/keyboards/ai03/soyuz/keyboard.json
index 61e8375dd18..2abfbd5ead5 100644
--- a/keyboards/ai03/soyuz/keyboard.json
+++ b/keyboards/ai03/soyuz/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "B3", "D7", "B5"],
         "rows": ["D4", "C6", "B6", "E6", "B4"]
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
deleted file mode 100644
index b575a49f388..00000000000
--- a/keyboards/ai03/vega/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ai03/vega/keyboard.json b/keyboards/ai03/vega/keyboard.json
index 64eaf5eadd7..a58fa4fcaef 100644
--- a/keyboards/ai03/vega/keyboard.json
+++ b/keyboards/ai03/vega/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"],
         "rows": ["A1", "A2", "B3", "A15", "A10"]
diff --git a/keyboards/aidansmithdotdev/sango/info.json b/keyboards/aidansmithdotdev/sango/keyboard.json
similarity index 100%
rename from keyboards/aidansmithdotdev/sango/info.json
rename to keyboards/aidansmithdotdev/sango/keyboard.json
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
deleted file mode 100644
index 4ffa418a091..00000000000
--- a/keyboards/akb/raine/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Elliot Powell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/akb/raine/keyboard.json b/keyboards/akb/raine/keyboard.json
index f3631068fd5..a8e841637ab 100644
--- a/keyboards/akb/raine/keyboard.json
+++ b/keyboards/akb/raine/keyboard.json
@@ -15,6 +15,12 @@
         "mousekey": false,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
         "rows": ["E6", "C6", "F7", "B2", "B0"]
diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/info.json
deleted file mode 100644
index e1e69e2510e..00000000000
--- a/keyboards/akegata_denki/device_one/info.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-  "keyboard_name": "device one",
-  "manufacturer": "akegata denki",
-  "url": "https://akegata.co",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xADD0",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
-    "rows": ["B1", "B0", "A9", "A8", "A0"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F042",
-  "bootloader": "stm32-dfu",
-  "board": "ST_NUCLEO32_F042K6",
-  "maintainer": "qmk",
-  "community_layouts": ["60_ansi", "60_iso"],
-  "layouts": {
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "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, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-        {"matrix": [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},
-        {"matrix": [1, 13], "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, 14], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi_split_bs": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi_arrow": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 13], "x": 13, "y": 3},
-        {"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, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 11], "x": 12, "y": 4},
-        {"matrix": [4, 13], "x": 13, "y": 4},
-        {"matrix": [4, 14], "x": 14, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/akegata_denki/device_one/keyboard.json b/keyboards/akegata_denki/device_one/keyboard.json
new file mode 100644
index 00000000000..b85f186ad6f
--- /dev/null
+++ b/keyboards/akegata_denki/device_one/keyboard.json
@@ -0,0 +1,308 @@
+{
+  "keyboard_name": "device one",
+  "manufacturer": "akegata denki",
+  "url": "https://akegata.co",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xADD0",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": false,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
+    "rows": ["B1", "B0", "A9", "A8", "A0"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F042",
+  "bootloader": "stm32-dfu",
+  "board": "ST_NUCLEO32_F042K6",
+  "maintainer": "qmk",
+  "community_layouts": ["60_ansi", "60_iso"],
+  "layouts": {
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "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, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [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},
+        {"matrix": [1, 13], "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, 14], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi_split_bs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi_arrow": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 13, "y": 3},
+        {"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, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 11], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk
deleted file mode 100644
index 26de1138e5f..00000000000
--- a/keyboards/akegata_denki/device_one/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no				# Mouse keys
-EXTRAKEY_ENABLE = no				# Audio control and System control
-CONSOLE_ENABLE = no					# Console for debug
-COMMAND_ENABLE = no    			# Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
-
diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h
index ceb98727385..888dfa6f800 100644
--- a/keyboards/akko/5087/config.h
+++ b/keyboards/akko/5087/config.h
@@ -20,11 +20,6 @@
 #define LED_MAC_OS_PIN C10
 #define LED_WIN_LOCK_PIN C11
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
diff --git a/keyboards/akko/5087/keyboard.json b/keyboards/akko/5087/keyboard.json
index 67ea54c169b..a2f72351ed6 100644
--- a/keyboards/akko/5087/keyboard.json
+++ b/keyboards/akko/5087/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "dynamic_keymap": {
         "layer_count": 6
     },
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
index 6a509733d6a..f3d8ed4d67a 100644
--- a/keyboards/akko/5108/config.h
+++ b/keyboards/akko/5108/config.h
@@ -19,11 +19,6 @@
 /* LED Indicators */
 #define LED_WIN_LOCK_PIN C11
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
diff --git a/keyboards/akko/5108/keyboard.json b/keyboards/akko/5108/keyboard.json
index 5e97d151c34..e98e421089b 100644
--- a/keyboards/akko/5108/keyboard.json
+++ b/keyboards/akko/5108/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
         "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
index cdc4b6011a3..dc309c4a41b 100644
--- a/keyboards/akko/acr87/config.h
+++ b/keyboards/akko/acr87/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
diff --git a/keyboards/akko/acr87/keyboard.json b/keyboards/akko/acr87/keyboard.json
index 2702ee79152..9f37a91b9a8 100644
--- a/keyboards/akko/acr87/keyboard.json
+++ b/keyboards/akko/acr87/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
         "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"]
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
index a23cf6db922..7924ae32148 100644
--- a/keyboards/akko/top40/config.h
+++ b/keyboards/akko/top40/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
diff --git a/keyboards/akko/top40/keyboard.json b/keyboards/akko/top40/keyboard.json
index 183c9242f4e..fd7cf497e75 100644
--- a/keyboards/akko/top40/keyboard.json
+++ b/keyboards/akko/top40/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4"],
         "rows": ["C7", "C8", "C9", "A8"]
diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index 32c7bcbd2a8..e864567cec7 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -27,11 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 }
 #define SN74X154_E1_PIN D3
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json
deleted file mode 100644
index 6051163dc73..00000000000
--- a/keyboards/al1/info.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-    "keyboard_name": "AL1",
-    "manufacturer": "Alsoran",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x544C",
-        "pid": "0x6050",
-        "device_version": "1.0.4"
-    },
-    "backlight": {
-        "pin": "B6",
-        "breathing": true
-    },
-    "indicators": {
-        "caps_lock": "B7",
-        "num_lock": "D0",
-        "scroll_lock": "D1",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 14], "x": 16.5, "y": 0},
-                {"matrix": [0, 15], "x": 17.5, "y": 0},
-                {"matrix": [4, 15], "x": 18.5, "y": 0},
-                {"matrix": [4, 14], "x": 19.5, "y": 0},
-
-                {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 0], "x": 1.5, "y": 1},
-                {"matrix": [1, 1], "x": 2.5, "y": 1},
-                {"matrix": [1, 2], "x": 3.5, "y": 1},
-                {"matrix": [1, 3], "x": 4.5, "y": 1},
-                {"matrix": [1, 4], "x": 5.5, "y": 1},
-                {"matrix": [1, 5], "x": 6.5, "y": 1},
-                {"matrix": [1, 6], "x": 7.5, "y": 1},
-                {"matrix": [1, 7], "x": 8.5, "y": 1},
-                {"matrix": [1, 8], "x": 9.5, "y": 1},
-                {"matrix": [1, 9], "x": 10.5, "y": 1},
-                {"matrix": [1, 10], "x": 11.5, "y": 1},
-                {"matrix": [1, 11], "x": 12.5, "y": 1},
-                {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 13], "x": 15.25, "y": 1},
-
-                {"matrix": [1, 14], "x": 16.5, "y": 1},
-                {"matrix": [1, 15], "x": 17.5, "y": 1},
-                {"matrix": [2, 15], "x": 18.5, "y": 1},
-                {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
-
-                {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 1], "x": 2.75, "y": 2},
-                {"matrix": [2, 2], "x": 3.75, "y": 2},
-                {"matrix": [2, 3], "x": 4.75, "y": 2},
-                {"matrix": [2, 4], "x": 5.75, "y": 2},
-                {"matrix": [2, 5], "x": 6.75, "y": 2},
-                {"matrix": [2, 6], "x": 7.75, "y": 2},
-                {"matrix": [2, 7], "x": 8.75, "y": 2},
-                {"matrix": [2, 8], "x": 9.75, "y": 2},
-                {"matrix": [2, 9], "x": 10.75, "y": 2},
-                {"matrix": [2, 10], "x": 11.75, "y": 2},
-                {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 12], "x": 16.5, "y": 2},
-                {"matrix": [2, 13], "x": 17.5, "y": 2},
-                {"matrix": [2, 14], "x": 18.5, "y": 2},
-
-                {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 1], "x": 3.25, "y": 3},
-                {"matrix": [3, 2], "x": 4.25, "y": 3},
-                {"matrix": [3, 3], "x": 5.25, "y": 3},
-                {"matrix": [3, 4], "x": 6.25, "y": 3},
-                {"matrix": [3, 5], "x": 7.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-
-                {"matrix": [3, 12], "x": 15.25, "y": 3.25},
-
-                {"matrix": [3, 13], "x": 16.5, "y": 3},
-                {"matrix": [3, 14], "x": 17.5, "y": 3},
-                {"matrix": [3, 15], "x": 18.5, "y": 3},
-                {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 11.75, "y": 4},
-                {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 10], "x": 17.5, "y": 4},
-                {"matrix": [4, 11], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_split_bs": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 6], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [5, 12], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 14], "x": 16.5, "y": 0},
-                {"matrix": [0, 15], "x": 17.5, "y": 0},
-                {"matrix": [4, 15], "x": 18.5, "y": 0},
-                {"matrix": [4, 14], "x": 19.5, "y": 0},
-
-                {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 0], "x": 1.5, "y": 1},
-                {"matrix": [1, 1], "x": 2.5, "y": 1},
-                {"matrix": [1, 2], "x": 3.5, "y": 1},
-                {"matrix": [1, 3], "x": 4.5, "y": 1},
-                {"matrix": [1, 4], "x": 5.5, "y": 1},
-                {"matrix": [1, 5], "x": 6.5, "y": 1},
-                {"matrix": [1, 6], "x": 7.5, "y": 1},
-                {"matrix": [1, 7], "x": 8.5, "y": 1},
-                {"matrix": [1, 8], "x": 9.5, "y": 1},
-                {"matrix": [1, 9], "x": 10.5, "y": 1},
-                {"matrix": [1, 10], "x": 11.5, "y": 1},
-                {"matrix": [1, 11], "x": 12.5, "y": 1},
-                {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 13], "x": 15.25, "y": 1},
-
-                {"matrix": [1, 14], "x": 16.5, "y": 1},
-                {"matrix": [1, 15], "x": 17.5, "y": 1},
-                {"matrix": [2, 15], "x": 18.5, "y": 1},
-                {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
-
-                {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 0], "x": 1.75, "y": 2},
-                {"matrix": [2, 1], "x": 2.75, "y": 2},
-                {"matrix": [2, 2], "x": 3.75, "y": 2},
-                {"matrix": [2, 3], "x": 4.75, "y": 2},
-                {"matrix": [2, 4], "x": 5.75, "y": 2},
-                {"matrix": [2, 5], "x": 6.75, "y": 2},
-                {"matrix": [2, 6], "x": 7.75, "y": 2},
-                {"matrix": [2, 7], "x": 8.75, "y": 2},
-                {"matrix": [2, 8], "x": 9.75, "y": 2},
-                {"matrix": [2, 9], "x": 10.75, "y": 2},
-                {"matrix": [2, 10], "x": 11.75, "y": 2},
-                {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 12], "x": 16.5, "y": 2},
-                {"matrix": [2, 13], "x": 17.5, "y": 2},
-                {"matrix": [2, 14], "x": 18.5, "y": 2},
-
-                {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 0], "x": 2.25, "y": 3},
-                {"matrix": [3, 1], "x": 3.25, "y": 3},
-                {"matrix": [3, 2], "x": 4.25, "y": 3},
-                {"matrix": [3, 3], "x": 5.25, "y": 3},
-                {"matrix": [3, 4], "x": 6.25, "y": 3},
-                {"matrix": [3, 5], "x": 7.25, "y": 3},
-                {"matrix": [3, 6], "x": 8.25, "y": 3},
-                {"matrix": [3, 7], "x": 9.25, "y": 3},
-                {"matrix": [3, 8], "x": 10.25, "y": 3},
-                {"matrix": [3, 9], "x": 11.25, "y": 3},
-                {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-
-                {"matrix": [3, 12], "x": 15.25, "y": 3.25},
-
-                {"matrix": [3, 13], "x": 16.5, "y": 3},
-                {"matrix": [3, 14], "x": 17.5, "y": 3},
-                {"matrix": [3, 15], "x": 18.5, "y": 3},
-                {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 11.75, "y": 4},
-                {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 10], "x": 17.5, "y": 4},
-                {"matrix": [4, 11], "x": 18.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/al1/keyboard.json b/keyboards/al1/keyboard.json
new file mode 100644
index 00000000000..7e6440560ff
--- /dev/null
+++ b/keyboards/al1/keyboard.json
@@ -0,0 +1,242 @@
+{
+    "keyboard_name": "AL1",
+    "manufacturer": "Alsoran",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x544C",
+        "pid": "0x6050",
+        "device_version": "1.0.4"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "backlight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "backlight": {
+        "pin": "B6",
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "B7",
+        "num_lock": "D0",
+        "scroll_lock": "D1",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+                {"matrix": [4, 15], "x": 18.5, "y": 0},
+                {"matrix": [4, 14], "x": 19.5, "y": 0},
+
+                {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1},
+                {"matrix": [2, 15], "x": 18.5, "y": 1},
+                {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
+
+                {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 12], "x": 16.5, "y": 2},
+                {"matrix": [2, 13], "x": 17.5, "y": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2},
+
+                {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+
+                {"matrix": [3, 12], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 13], "x": 16.5, "y": 3},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+                {"matrix": [3, 15], "x": 18.5, "y": 3},
+                {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 11.75, "y": 4},
+                {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 10], "x": 17.5, "y": 4},
+                {"matrix": [4, 11], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [5, 12], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 16.5, "y": 0},
+                {"matrix": [0, 15], "x": 17.5, "y": 0},
+                {"matrix": [4, 15], "x": 18.5, "y": 0},
+                {"matrix": [4, 14], "x": 19.5, "y": 0},
+
+                {"matrix": [5, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 13], "x": 15.25, "y": 1},
+
+                {"matrix": [1, 14], "x": 16.5, "y": 1},
+                {"matrix": [1, 15], "x": 17.5, "y": 1},
+                {"matrix": [2, 15], "x": 18.5, "y": 1},
+                {"matrix": [4, 13], "x": 19.5, "y": 1, "h": 2},
+
+                {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 12], "x": 16.5, "y": 2},
+                {"matrix": [2, 13], "x": 17.5, "y": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2},
+
+                {"matrix": [5, 3], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+
+                {"matrix": [3, 12], "x": 15.25, "y": 3.25},
+
+                {"matrix": [3, 13], "x": 16.5, "y": 3},
+                {"matrix": [3, 14], "x": 17.5, "y": 3},
+                {"matrix": [3, 15], "x": 18.5, "y": 3},
+                {"matrix": [4, 12], "x": 19.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 7},
+                {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 11.75, "y": 4},
+                {"matrix": [4, 6], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 10], "x": 17.5, "y": 4},
+                {"matrix": [4, 11], "x": 18.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk
index ca917bc5480..73713d8a3f8 100644
--- a/keyboards/al1/rules.mk
+++ b/keyboards/al1/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 VPATH += drivers/gpio
 SRC += matrix.c sn74x154.c
diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json
deleted file mode 100755
index 5c5e29f5956..00000000000
--- a/keyboards/alas/info.json
+++ /dev/null
@@ -1,585 +0,0 @@
-{
-    "keyboard_name": "Alas",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x414C",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 12], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "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": [2, 12], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 12], "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, 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": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [2, 12], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/alas/keyboard.json b/keyboards/alas/keyboard.json
new file mode 100755
index 00000000000..b5617189dec
--- /dev/null
+++ b/keyboards/alas/keyboard.json
@@ -0,0 +1,592 @@
+{
+    "keyboard_name": "Alas",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x414C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_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": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "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": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 12], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/alas/rules.mk b/keyboards/alas/rules.mk
index 916e1bf9bb7..0ab54aaaf71 100644
--- a/keyboards/alas/rules.mk
+++ b/keyboards/alas/rules.mk
@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
deleted file mode 100644
index a66b5188b60..00000000000
--- a/keyboards/aleblazer/zodiark/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "keyboard_name": "Zodiark",
-    "manufacturer": "Aleblazer",
-    "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
-    "maintainer": "Aleblazer",
-    "usb": {
-        "vid": "0xF901",
-        "pid": "0xF902",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 68,
-        "max_brightness": 170,
-        "split_count": [34, 34],
-        "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": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "sat_steps": 8,
-        "speed_steps": 10,
-        "split_count": [34, 34],
-        "val_steps": 8
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D3",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "D4", "pin_b": "D2", "resolution": 3}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53},
-                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53},
-                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125},
-                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125},
-                {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25},
-                {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125},
-                {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0},
-                {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125},
-                {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53},
-                {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53},
-
-                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53},
-                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53},
-                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125},
-                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125},
-                {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7},
-
-                {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7},
-
-                {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25},
-                {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125},
-                {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1},
-                {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125},
-                {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53},
-                {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53},
-
-                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53},
-                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53},
-                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125},
-                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
-                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125},
-                {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7},
-
-                {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7},
-
-                {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25},
-                {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125},
-                {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2},
-                {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125},
-                {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53},
-                {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53},
-
-                {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53},
-                {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53},
-                {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125},
-                {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
-                {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125},
-                {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25},
-                {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25},
-
-                {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25},
-                {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25},
-
-                {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25},
-                {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125},
-                {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3},
-                {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125},
-                {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53},
-                {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53},
-
-                {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53},
-                {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53},
-                {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125},
-                {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4},
-                {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125},
-                {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5},
-                {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25},
-
-                {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25},
-                {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5},
-                {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125},
-                {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4},
-                {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125},
-                {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53},
-                {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aleblazer/zodiark/keyboard.json b/keyboards/aleblazer/zodiark/keyboard.json
new file mode 100644
index 00000000000..9f77049dee1
--- /dev/null
+++ b/keyboards/aleblazer/zodiark/keyboard.json
@@ -0,0 +1,165 @@
+{
+    "keyboard_name": "Zodiark",
+    "manufacturer": "Aleblazer",
+    "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
+    "maintainer": "Aleblazer",
+    "usb": {
+        "vid": "0xF901",
+        "pid": "0xF902",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "oled": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 68,
+        "max_brightness": 170,
+        "split_count": [34, 34],
+        "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": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "split_count": [34, 34],
+        "val_steps": 8
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D4", "resolution": 3}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "D4", "pin_b": "D2", "resolution": 3}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125},
+                {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25},
+                {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125},
+                {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0},
+                {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125},
+                {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53},
+                {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53},
+
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125},
+                {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7},
+
+                {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7},
+
+                {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25},
+                {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125},
+                {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1},
+                {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125},
+                {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53},
+                {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53},
+
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125},
+                {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7},
+
+                {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7},
+
+                {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25},
+                {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125},
+                {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2},
+                {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125},
+                {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53},
+                {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53},
+
+                {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53},
+                {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53},
+                {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125},
+                {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125},
+                {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25},
+                {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25},
+
+                {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25},
+                {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25},
+
+                {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25},
+                {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125},
+                {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3},
+                {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125},
+                {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53},
+                {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53},
+
+                {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53},
+                {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53},
+                {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125},
+                {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125},
+                {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5},
+                {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25},
+
+                {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25},
+                {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5},
+                {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125},
+                {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4},
+                {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125},
+                {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53},
+                {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk
deleted file mode 100644
index 8fc2f2ff256..00000000000
--- a/keyboards/aleblazer/zodiark/rules.mk
+++ /dev/null
@@ -1,16 +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
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
deleted file mode 100644
index d876570c808..00000000000
--- a/keyboards/alf/dc60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/alf/dc60/keyboard.json b/keyboards/alf/dc60/keyboard.json
index 7fd360d726a..ea04748f847 100644
--- a/keyboards/alf/dc60/keyboard.json
+++ b/keyboards/alf/dc60/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
         "rows": ["B0", "B1", "B2", "B3", "B4"]
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
deleted file mode 100644
index b5b661bef2a..00000000000
--- a/keyboards/alf/x11/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/alf/x11/keyboard.json b/keyboards/alf/x11/keyboard.json
index 03abfc2dbed..c571705dc10 100644
--- a/keyboards/alf/x11/keyboard.json
+++ b/keyboards/alf/x11/keyboard.json
@@ -21,6 +21,12 @@
     "nkro": false,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"],
     "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"]
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
deleted file mode 100644
index 02460e0beda..00000000000
--- a/keyboards/alf/x2/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018-2021 @fixed, MechMerlin, QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/alf/x2/keyboard.json b/keyboards/alf/x2/keyboard.json
index fe700979327..9dd011c7f1c 100644
--- a/keyboards/alf/x2/keyboard.json
+++ b/keyboards/alf/x2/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": 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"]
diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
deleted file mode 100644
index ff87862693a..00000000000
--- a/keyboards/aliceh66/pianoforte/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json
deleted file mode 100644
index 6cc2546794c..00000000000
--- a/keyboards/aliceh66/pianoforte/info.json
+++ /dev/null
@@ -1,992 +0,0 @@
-{
-    "keyboard_name": "pianoforte solder",
-    "manufacturer": "AliceH",
-    "url": "https://github.com/AliceH66",
-    "maintainer": "AliceH66",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x7066",
-        "vid": "0x6168"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"],
-        "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"],
-    "layout_aliases": {
-        "LAYOUT_tkl_ansi_7u": "LAYOUT_tkl_f13_ansi_tsangan",
-        "LAYOUT_tkl_iso_7u": "LAYOUT_tkl_f13_iso_tsangan"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25},
-                {"matrix": [6, 7], "x": 14, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.25, "y": 4.75, "w": 1.75, "h": 0.5},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75, "h": 0.5},
-                {"matrix": [8, 7], "x": 14, "y": 4.75, "h": 0.5},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25},
-                {"matrix": [6, 7], "x": 14, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 7], "x": 14, "y": 4.25},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25},
-                {"matrix": [6, 7], "x": 14, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 7], "x": 14, "y": 4.25},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
-                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25},
-                {"matrix": [6, 7], "x": 14, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 7], "x": 14, "y": 4.25},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
-                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
-                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25},
-                {"matrix": [6, 7], "x": 14, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [8, 7], "x": 14, "y": 4.25},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
-                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aliceh66/pianoforte/keyboard.json b/keyboards/aliceh66/pianoforte/keyboard.json
new file mode 100644
index 00000000000..b732b02db25
--- /dev/null
+++ b/keyboards/aliceh66/pianoforte/keyboard.json
@@ -0,0 +1,1007 @@
+{
+    "keyboard_name": "pianoforte solder",
+    "manufacturer": "AliceH",
+    "url": "https://github.com/AliceH66",
+    "maintainer": "AliceH66",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7066",
+        "vid": "0x6168"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"],
+        "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"],
+    "layout_aliases": {
+        "LAYOUT_tkl_ansi_7u": "LAYOUT_tkl_f13_ansi_tsangan",
+        "LAYOUT_tkl_iso_7u": "LAYOUT_tkl_f13_iso_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.75, "w": 1.75, "h": 0.5},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75, "h": 0.5},
+                {"matrix": [8, 7], "x": 14, "y": 4.75, "h": 0.5},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk
index 2f9cd4eea95..4b54462335d 100644
--- a/keyboards/aliceh66/pianoforte/rules.mk
+++ b/keyboards/aliceh66/pianoforte/rules.mk
@@ -1,16 +1,2 @@
 # Processor Frequency
 F_CPU = 8000000
-
-# 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
-LTO_ENABLE = yes
diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
deleted file mode 100644
index ff87862693a..00000000000
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 AliceH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json
deleted file mode 100644
index 7366e961c1f..00000000000
--- a/keyboards/aliceh66/pianoforte_hs/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "pianoforte hotswap",
-    "manufacturer": "AliceH",
-    "url": "https://github.com/AliceH66",
-    "maintainer": "AliceH66",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x7068",
-        "vid": "0x6168"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"],
-        "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_tkl_ansi": "LAYOUT_tkl_f13_ansi"
-    },
-    "community_layouts": ["tkl_f13_ansi"],
-    "layouts": {
-        "LAYOUT_tkl_f13_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 0},
-                {"matrix": [0, 2], "x": 4.25, "y": 0},
-
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-
-                {"matrix": [1, 4], "x": 9.75, "y": 0},
-                {"matrix": [0, 5], "x": 10.75, "y": 0},
-                {"matrix": [1, 5], "x": 11.75, "y": 0},
-                {"matrix": [0, 6], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aliceh66/pianoforte_hs/keyboard.json b/keyboards/aliceh66/pianoforte_hs/keyboard.json
new file mode 100644
index 00000000000..ff73a00ea85
--- /dev/null
+++ b/keyboards/aliceh66/pianoforte_hs/keyboard.json
@@ -0,0 +1,145 @@
+{
+    "keyboard_name": "pianoforte hotswap",
+    "manufacturer": "AliceH",
+    "url": "https://github.com/AliceH66",
+    "maintainer": "AliceH66",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7068",
+        "vid": "0x6168"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"],
+        "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_tkl_ansi": "LAYOUT_tkl_f13_ansi"
+    },
+    "community_layouts": ["tkl_f13_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aliceh66/pianoforte_hs/rules.mk b/keyboards/aliceh66/pianoforte_hs/rules.mk
index 3488ea0dd24..4b54462335d 100644
--- a/keyboards/aliceh66/pianoforte_hs/rules.mk
+++ b/keyboards/aliceh66/pianoforte_hs/rules.mk
@@ -1,16 +1,2 @@
 # Processor Frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
deleted file mode 100755
index 5f360813239..00000000000
--- a/keyboards/alpha/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/alpha/keyboard.json b/keyboards/alpha/keyboard.json
index f708ad2b9f5..1cb2fe71cd2 100644
--- a/keyboards/alpha/keyboard.json
+++ b/keyboards/alpha/keyboard.json
@@ -36,6 +36,12 @@
     "nkro": true,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"],
     "rows": ["D4", "B4", "B5"]
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/alpine65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/alpine65/keyboard.json b/keyboards/alpine65/keyboard.json
index 4fccb3c564e..36bba880a8f 100644
--- a/keyboards/alpine65/keyboard.json
+++ b/keyboards/alpine65/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"],
         "rows": ["C14", "C15", "C13", "A2", "A3"]
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
deleted file mode 100644
index 4b007cf387e..00000000000
--- a/keyboards/alps64/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/alps64/keyboard.json b/keyboards/alps64/keyboard.json
index 72f21d0c33d..a6a60478f81 100644
--- a/keyboards/alps64/keyboard.json
+++ b/keyboards/alps64/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"],
     "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"]
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index ffff9dc8c6f..9dd9e9bdde5 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define USE_I2C
 
 /* Select hand configuration */
diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
deleted file mode 100644
index cf90324c142..00000000000
--- a/keyboards/alt34/rev1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "alt34",
-    "manufacturer": "altosys",
-    "url": "https://gitlab.com/altosys/alt34",
-    "maintainer": "@altosys",
-    "usb": {
-        "vid": "0x1ABC",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["split_3x5_2"],
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.93},
-                {"matrix": [0, 1], "x": 1, "y": 0.31},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.28},
-                {"matrix": [0, 4], "x": 4, "y": 0.42},
-
-                {"matrix": [4, 4], "x": 7, "y": 0.42},
-                {"matrix": [4, 3], "x": 8, "y": 0.28},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 1], "x": 10, "y": 0.31},
-                {"matrix": [4, 0], "x": 11, "y": 0.93},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.93},
-                {"matrix": [1, 1], "x": 1, "y": 1.31},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.28},
-                {"matrix": [1, 4], "x": 4, "y": 1.42},
-
-                {"matrix": [5, 4], "x": 7, "y": 1.42},
-                {"matrix": [5, 3], "x": 8, "y": 1.28},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1.31},
-                {"matrix": [5, 0], "x": 11, "y": 1.93},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.93},
-                {"matrix": [2, 1], "x": 1, "y": 2.31},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.28},
-                {"matrix": [2, 4], "x": 4, "y": 2.42},
-
-                {"matrix": [6, 4], "x": 7, "y": 2.42},
-                {"matrix": [6, 3], "x": 8, "y": 2.28},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 1], "x": 10, "y": 2.31},
-                {"matrix": [6, 0], "x": 11, "y": 2.93},
-
-                {"matrix": [3, 3], "x": 3.5, "y": 3.45},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.7},
-
-                {"matrix": [7, 4], "x": 6.5, "y": 3.7},
-                {"matrix": [7, 3], "x": 7.5, "y": 3.45}
-            ]
-        }
-    }
-}
diff --git a/keyboards/alt34/rev1/keyboard.json b/keyboards/alt34/rev1/keyboard.json
new file mode 100644
index 00000000000..712dd72943b
--- /dev/null
+++ b/keyboards/alt34/rev1/keyboard.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "alt34",
+    "manufacturer": "altosys",
+    "url": "https://gitlab.com/altosys/alt34",
+    "maintainer": "@altosys",
+    "usb": {
+        "vid": "0x1ABC",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "split": {
+        "enabled": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["split_3x5_2"],
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.93},
+                {"matrix": [0, 1], "x": 1, "y": 0.31},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.28},
+                {"matrix": [0, 4], "x": 4, "y": 0.42},
+
+                {"matrix": [4, 4], "x": 7, "y": 0.42},
+                {"matrix": [4, 3], "x": 8, "y": 0.28},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0.31},
+                {"matrix": [4, 0], "x": 11, "y": 0.93},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.93},
+                {"matrix": [1, 1], "x": 1, "y": 1.31},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.28},
+                {"matrix": [1, 4], "x": 4, "y": 1.42},
+
+                {"matrix": [5, 4], "x": 7, "y": 1.42},
+                {"matrix": [5, 3], "x": 8, "y": 1.28},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1.31},
+                {"matrix": [5, 0], "x": 11, "y": 1.93},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.93},
+                {"matrix": [2, 1], "x": 1, "y": 2.31},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.28},
+                {"matrix": [2, 4], "x": 4, "y": 2.42},
+
+                {"matrix": [6, 4], "x": 7, "y": 2.42},
+                {"matrix": [6, 3], "x": 8, "y": 2.28},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2.31},
+                {"matrix": [6, 0], "x": 11, "y": 2.93},
+
+                {"matrix": [3, 3], "x": 3.5, "y": 3.45},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.7},
+
+                {"matrix": [7, 4], "x": 6.5, "y": 3.7},
+                {"matrix": [7, 3], "x": 7.5, "y": 3.45}
+            ]
+        }
+    }
+}
diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk
deleted file mode 100644
index 99541b285bd..00000000000
--- a/keyboards/alt34/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change to "no" to disable the options
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
deleted file mode 100644
index cdad6969cbc..00000000000
--- a/keyboards/amag23/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/amag23/keyboard.json b/keyboards/amag23/keyboard.json
index ed37a36e548..e3eb16cdad5 100644
--- a/keyboards/amag23/keyboard.json
+++ b/keyboards/amag23/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
         "rows": ["A0", "A1", "A2", "A3"]
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
deleted file mode 100755
index b9449c4714b..00000000000
--- a/keyboards/amjkeyboard/amj40/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/amjkeyboard/amj40/keyboard.json b/keyboards/amjkeyboard/amj40/keyboard.json
index 8ce166728ca..de536cb55e4 100644
--- a/keyboards/amjkeyboard/amj40/keyboard.json
+++ b/keyboards/amjkeyboard/amj40/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"],
         "rows": ["F4", "F5", "F6", "F7"]
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/amjkeyboard/amj60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/amjkeyboard/amj60/keyboard.json b/keyboards/amjkeyboard/amj60/keyboard.json
index 0b65c742aa4..5ab353675a7 100644
--- a/keyboards/amjkeyboard/amj60/keyboard.json
+++ b/keyboards/amjkeyboard/amj60/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
         "rows": ["F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
deleted file mode 100644
index b48aca77700..00000000000
--- a/keyboards/amjkeyboard/amj66/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Alex Peters
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json
deleted file mode 100644
index 07a170a3f6a..00000000000
--- a/keyboards/amjkeyboard/amj66/info.json
+++ /dev/null
@@ -1,259 +0,0 @@
-{
-    "keyboard_name": "AMJ66",
-    "manufacturer": "AMJKeyboard",
-    "url": "",
-    "maintainer": "FSund, qmk",
-    "usb": {
-        "vid": "0x00D8",
-        "pid": "0xBD66",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"],
-        "rows": ["F7", "F6", "F5", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "driver": "timer",
-        "pin": "D4",
-        "breathing": true
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["66_ansi", "66_iso"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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.25},
-                {"matrix": [3, 13], "x": 13.5, "y": 3},
-                {"matrix": [3, 14], "x": 14.5, "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.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
-                {"matrix": [4, 4], "x": 6.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 13.5, "y": 4},
-                {"matrix": [4, 9], "x": 14.5, "y": 4},
-                {"matrix": [4, 10], "x": 15.5, "y": 4}
-            ]
-        },
-        "LAYOUT_66_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 11.25, "y": 4},
-                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 13.5, "y": 4},
-                {"matrix": [4, 9], "x": 14.5, "y": 4},
-                {"matrix": [4, 10], "x": 15.5, "y": 4}
-            ]
-        },
-        "LAYOUT_66_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [1, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 12], "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, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 11.25, "y": 4},
-                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 13.5, "y": 4},
-                {"matrix": [4, 9], "x": 14.5, "y": 4},
-                {"matrix": [4, 10], "x": 15.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/amjkeyboard/amj66/keyboard.json b/keyboards/amjkeyboard/amj66/keyboard.json
new file mode 100644
index 00000000000..72646e4fc71
--- /dev/null
+++ b/keyboards/amjkeyboard/amj66/keyboard.json
@@ -0,0 +1,273 @@
+{
+    "keyboard_name": "AMJ66",
+    "manufacturer": "AMJKeyboard",
+    "url": "",
+    "maintainer": "FSund, qmk",
+    "usb": {
+        "vid": "0x00D8",
+        "pid": "0xBD66",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "backlight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"],
+        "rows": ["F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "driver": "timer",
+        "pin": "D4",
+        "breathing": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["66_ansi", "66_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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.25},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "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.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+                {"matrix": [4, 4], "x": 6.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 5], "x": 9.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 11.25, "y": 4},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "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, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 11.25, "y": 4},
+                {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 13.5, "y": 4},
+                {"matrix": [4, 9], "x": 14.5, "y": 4},
+                {"matrix": [4, 10], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/amjkeyboard/amj66/rules.mk b/keyboards/amjkeyboard/amj66/rules.mk
index cb4a880111b..09057bea54b 100644
--- a/keyboards/amjkeyboard/amj66/rules.mk
+++ b/keyboards/amjkeyboard/amj66/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
deleted file mode 100644
index 86415b251a0..00000000000
--- a/keyboards/amjkeyboard/amj84/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/amjkeyboard/amj84/keyboard.json b/keyboards/amjkeyboard/amj84/keyboard.json
index 217b685391f..b544ffc8b3c 100644
--- a/keyboards/amjkeyboard/amj84/keyboard.json
+++ b/keyboards/amjkeyboard/amj84/keyboard.json
@@ -18,6 +18,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"],
         "rows": ["D0", "F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index b16c84d50eb..81cbb4a5e0b 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,11 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
deleted file mode 100644
index 60cb8ee9e83..00000000000
--- a/keyboards/amjkeyboard/amj96/info.json
+++ /dev/null
@@ -1,369 +0,0 @@
-{
-    "keyboard_name": "AMJ96",
-    "manufacturer": "Han Chen",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x00D8",
-        "pid": "0x6074",
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [1, 1], "x": 1, "y": 0},
-                {"matrix": [1, 2], "x": 2, "y": 0},
-                {"matrix": [1, 3], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [1, 6], "x": 6, "y": 0},
-                {"matrix": [1, 7], "x": 7, "y": 0},
-                {"matrix": [1, 8], "x": 8, "y": 0},
-                {"matrix": [1, 9], "x": 9, "y": 0},
-                {"matrix": [1, 10], "x": 10, "y": 0},
-                {"matrix": [1, 11], "x": 11, "y": 0},
-                {"matrix": [1, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [1, 14], "x": 14, "y": 0},
-                {"matrix": [1, 15], "x": 15, "y": 0},
-                {"matrix": [0, 9], "x": 16, "y": 0},
-                {"matrix": [0, 10], "x": 17, "y": 0},
-                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
-                {"matrix": [2, 7], "x": 7, "y": 1},
-                {"matrix": [2, 8], "x": 8, "y": 1},
-                {"matrix": [2, 9], "x": 9, "y": 1},
-                {"matrix": [2, 10], "x": 10, "y": 1},
-                {"matrix": [2, 11], "x": 11, "y": 1},
-                {"matrix": [2, 12], "x": 12, "y": 1},
-                {"matrix": [2, 13], "x": 13, "y": 1},
-                {"matrix": [2, 14], "x": 14, "y": 1},
-                {"matrix": [2, 15], "x": 15, "y": 1},
-                {"matrix": [0, 11], "x": 16, "y": 1},
-                {"matrix": [0, 15], "x": 17, "y": 1},
-                {"matrix": [6, 15], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [3, 9], "x": 9.5, "y": 2},
-                {"matrix": [3, 10], "x": 10.5, "y": 2},
-                {"matrix": [3, 11], "x": 11.5, "y": 2},
-                {"matrix": [3, 12], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [3, 14], "x": 15, "y": 2},
-                {"matrix": [3, 15], "x": 16, "y": 2},
-                {"matrix": [0, 13], "x": 17, "y": 2},
-                {"matrix": [6, 13], "x": 18, "y": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3},
-                {"matrix": [4, 2], "x": 2.75, "y": 3},
-                {"matrix": [4, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 4], "x": 4.75, "y": 3},
-                {"matrix": [4, 5], "x": 5.75, "y": 3},
-                {"matrix": [4, 6], "x": 6.75, "y": 3},
-                {"matrix": [4, 7], "x": 7.75, "y": 3},
-                {"matrix": [4, 8], "x": 8.75, "y": 3},
-                {"matrix": [4, 9], "x": 9.75, "y": 3},
-                {"matrix": [4, 10], "x": 10.75, "y": 3},
-                {"matrix": [4, 11], "x": 11.75, "y": 3},
-                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [4, 13], "x": 15, "y": 3},
-                {"matrix": [4, 14], "x": 16, "y": 3},
-                {"matrix": [4, 15], "x": 17, "y": 3},
-                {"matrix": [6, 14], "x": 18, "y": 3},
-
-                {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 4},
-                {"matrix": [5, 2], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [5, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 5], "x": 5.25, "y": 4},
-                {"matrix": [5, 6], "x": 6.25, "y": 4},
-                {"matrix": [5, 7], "x": 7.25, "y": 4},
-                {"matrix": [5, 8], "x": 8.25, "y": 4},
-                {"matrix": [5, 9], "x": 9.25, "y": 4},
-                {"matrix": [5, 10], "x": 10.25, "y": 4},
-                {"matrix": [5, 11], "x": 11.25, "y": 4},
-                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [5, 13], "x": 14, "y": 4},
-                {"matrix": [5, 14], "x": 15, "y": 4},
-                {"matrix": [5, 15], "x": 16, "y": 4},
-                {"matrix": [0, 14], "x": 17, "y": 4},
-                {"matrix": [0, 7], "x": 18, "y": 4},
-
-                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [6, 6], "x": 13, "y": 5},
-                {"matrix": [6, 8], "x": 14, "y": 5},
-                {"matrix": [6, 9], "x": 15, "y": 5},
-                {"matrix": [6, 10], "x": 16, "y": 5},
-                {"matrix": [6, 11], "x": 17, "y": 5},
-                {"matrix": [6, 12], "x": 18, "y": 5}
-            ]
-        },
-        "LAYOUT_96_ansi_rwkl_split_num_plus_enter": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [1, 1], "x": 1, "y": 0},
-                {"matrix": [1, 2], "x": 2, "y": 0},
-                {"matrix": [1, 3], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [1, 6], "x": 6, "y": 0},
-                {"matrix": [1, 7], "x": 7, "y": 0},
-                {"matrix": [1, 8], "x": 8, "y": 0},
-                {"matrix": [1, 9], "x": 9, "y": 0},
-                {"matrix": [1, 10], "x": 10, "y": 0},
-                {"matrix": [1, 11], "x": 11, "y": 0},
-                {"matrix": [1, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [1, 14], "x": 14, "y": 0},
-                {"matrix": [1, 15], "x": 15, "y": 0},
-                {"matrix": [0, 9], "x": 16, "y": 0},
-                {"matrix": [0, 10], "x": 17, "y": 0},
-                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
-                {"matrix": [2, 7], "x": 7, "y": 1},
-                {"matrix": [2, 8], "x": 8, "y": 1},
-                {"matrix": [2, 9], "x": 9, "y": 1},
-                {"matrix": [2, 10], "x": 10, "y": 1},
-                {"matrix": [2, 11], "x": 11, "y": 1},
-                {"matrix": [2, 12], "x": 12, "y": 1},
-                {"matrix": [2, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [2, 15], "x": 15, "y": 1},
-                {"matrix": [0, 11], "x": 16, "y": 1},
-                {"matrix": [0, 15], "x": 17, "y": 1},
-                {"matrix": [6, 15], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [3, 9], "x": 9.5, "y": 2},
-                {"matrix": [3, 10], "x": 10.5, "y": 2},
-                {"matrix": [3, 11], "x": 11.5, "y": 2},
-                {"matrix": [3, 12], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [3, 14], "x": 15, "y": 2},
-                {"matrix": [3, 15], "x": 16, "y": 2},
-                {"matrix": [0, 13], "x": 17, "y": 2},
-                {"matrix": [6, 13], "x": 18, "y": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3},
-                {"matrix": [4, 2], "x": 2.75, "y": 3},
-                {"matrix": [4, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 4], "x": 4.75, "y": 3},
-                {"matrix": [4, 5], "x": 5.75, "y": 3},
-                {"matrix": [4, 6], "x": 6.75, "y": 3},
-                {"matrix": [4, 7], "x": 7.75, "y": 3},
-                {"matrix": [4, 8], "x": 8.75, "y": 3},
-                {"matrix": [4, 9], "x": 9.75, "y": 3},
-                {"matrix": [4, 10], "x": 10.75, "y": 3},
-                {"matrix": [4, 11], "x": 11.75, "y": 3},
-                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [4, 13], "x": 15, "y": 3},
-                {"matrix": [4, 14], "x": 16, "y": 3},
-                {"matrix": [4, 15], "x": 17, "y": 3},
-                {"matrix": [6, 14], "x": 18, "y": 3},
-
-                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [5, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 5], "x": 5.25, "y": 4},
-                {"matrix": [5, 6], "x": 6.25, "y": 4},
-                {"matrix": [5, 7], "x": 7.25, "y": 4},
-                {"matrix": [5, 8], "x": 8.25, "y": 4},
-                {"matrix": [5, 9], "x": 9.25, "y": 4},
-                {"matrix": [5, 10], "x": 10.25, "y": 4},
-                {"matrix": [5, 11], "x": 11.25, "y": 4},
-                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [5, 13], "x": 14, "y": 4},
-                {"matrix": [5, 14], "x": 15, "y": 4},
-                {"matrix": [5, 15], "x": 16, "y": 4},
-                {"matrix": [0, 14], "x": 17, "y": 4},
-                {"matrix": [0, 7], "x": 18, "y": 4},
-
-                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [6, 6], "x": 13, "y": 5},
-                {"matrix": [6, 8], "x": 14, "y": 5},
-                {"matrix": [6, 9], "x": 15, "y": 5},
-                {"matrix": [6, 10], "x": 16, "y": 5},
-                {"matrix": [6, 11], "x": 17, "y": 5},
-                {"matrix": [6, 12], "x": 18, "y": 5}
-            ]
-        },
-        "LAYOUT_96_ansi_rwkl_split_bs_num_plus_enter": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [1, 1], "x": 1, "y": 0},
-                {"matrix": [1, 2], "x": 2, "y": 0},
-                {"matrix": [1, 3], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [1, 6], "x": 6, "y": 0},
-                {"matrix": [1, 7], "x": 7, "y": 0},
-                {"matrix": [1, 8], "x": 8, "y": 0},
-                {"matrix": [1, 9], "x": 9, "y": 0},
-                {"matrix": [1, 10], "x": 10, "y": 0},
-                {"matrix": [1, 11], "x": 11, "y": 0},
-                {"matrix": [1, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [1, 14], "x": 14, "y": 0},
-                {"matrix": [1, 15], "x": 15, "y": 0},
-                {"matrix": [0, 9], "x": 16, "y": 0},
-                {"matrix": [0, 10], "x": 17, "y": 0},
-                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
-                {"matrix": [2, 7], "x": 7, "y": 1},
-                {"matrix": [2, 8], "x": 8, "y": 1},
-                {"matrix": [2, 9], "x": 9, "y": 1},
-                {"matrix": [2, 10], "x": 10, "y": 1},
-                {"matrix": [2, 11], "x": 11, "y": 1},
-                {"matrix": [2, 12], "x": 12, "y": 1},
-                {"matrix": [2, 13], "x": 13, "y": 1},
-                {"matrix": [2, 14], "x": 14, "y": 1},
-                {"matrix": [2, 15], "x": 15, "y": 1},
-                {"matrix": [0, 11], "x": 16, "y": 1},
-                {"matrix": [0, 15], "x": 17, "y": 1},
-                {"matrix": [6, 15], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [3, 9], "x": 9.5, "y": 2},
-                {"matrix": [3, 10], "x": 10.5, "y": 2},
-                {"matrix": [3, 11], "x": 11.5, "y": 2},
-                {"matrix": [3, 12], "x": 12.5, "y": 2},
-                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [3, 14], "x": 15, "y": 2},
-                {"matrix": [3, 15], "x": 16, "y": 2},
-                {"matrix": [0, 13], "x": 17, "y": 2},
-                {"matrix": [6, 13], "x": 18, "y": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 3},
-                {"matrix": [4, 2], "x": 2.75, "y": 3},
-                {"matrix": [4, 3], "x": 3.75, "y": 3},
-                {"matrix": [4, 4], "x": 4.75, "y": 3},
-                {"matrix": [4, 5], "x": 5.75, "y": 3},
-                {"matrix": [4, 6], "x": 6.75, "y": 3},
-                {"matrix": [4, 7], "x": 7.75, "y": 3},
-                {"matrix": [4, 8], "x": 8.75, "y": 3},
-                {"matrix": [4, 9], "x": 9.75, "y": 3},
-                {"matrix": [4, 10], "x": 10.75, "y": 3},
-                {"matrix": [4, 11], "x": 11.75, "y": 3},
-                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [4, 13], "x": 15, "y": 3},
-                {"matrix": [4, 14], "x": 16, "y": 3},
-                {"matrix": [4, 15], "x": 17, "y": 3},
-                {"matrix": [6, 14], "x": 18, "y": 3},
-
-                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [5, 2], "x": 2.25, "y": 4},
-                {"matrix": [5, 3], "x": 3.25, "y": 4},
-                {"matrix": [5, 4], "x": 4.25, "y": 4},
-                {"matrix": [5, 5], "x": 5.25, "y": 4},
-                {"matrix": [5, 6], "x": 6.25, "y": 4},
-                {"matrix": [5, 7], "x": 7.25, "y": 4},
-                {"matrix": [5, 8], "x": 8.25, "y": 4},
-                {"matrix": [5, 9], "x": 9.25, "y": 4},
-                {"matrix": [5, 10], "x": 10.25, "y": 4},
-                {"matrix": [5, 11], "x": 11.25, "y": 4},
-                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [5, 13], "x": 14, "y": 4},
-                {"matrix": [5, 14], "x": 15, "y": 4},
-                {"matrix": [5, 15], "x": 16, "y": 4},
-                {"matrix": [0, 14], "x": 17, "y": 4},
-                {"matrix": [0, 7], "x": 18, "y": 4},
-
-                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [6, 6], "x": 13, "y": 5},
-                {"matrix": [6, 8], "x": 14, "y": 5},
-                {"matrix": [6, 9], "x": 15, "y": 5},
-                {"matrix": [6, 10], "x": 16, "y": 5},
-                {"matrix": [6, 11], "x": 17, "y": 5},
-                {"matrix": [6, 12], "x": 18, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/amjkeyboard/amj96/keyboard.json b/keyboards/amjkeyboard/amj96/keyboard.json
new file mode 100644
index 00000000000..23a131c6150
--- /dev/null
+++ b/keyboards/amjkeyboard/amj96/keyboard.json
@@ -0,0 +1,383 @@
+{
+    "keyboard_name": "AMJ96",
+    "manufacturer": "Han Chen",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x00D8",
+        "pid": "0x6074",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [1, 6], "x": 6, "y": 0},
+                {"matrix": [1, 7], "x": 7, "y": 0},
+                {"matrix": [1, 8], "x": 8, "y": 0},
+                {"matrix": [1, 9], "x": 9, "y": 0},
+                {"matrix": [1, 10], "x": 10, "y": 0},
+                {"matrix": [1, 11], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [1, 15], "x": 15, "y": 0},
+                {"matrix": [0, 9], "x": 16, "y": 0},
+                {"matrix": [0, 10], "x": 17, "y": 0},
+                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
+                {"matrix": [2, 7], "x": 7, "y": 1},
+                {"matrix": [2, 8], "x": 8, "y": 1},
+                {"matrix": [2, 9], "x": 9, "y": 1},
+                {"matrix": [2, 10], "x": 10, "y": 1},
+                {"matrix": [2, 11], "x": 11, "y": 1},
+                {"matrix": [2, 12], "x": 12, "y": 1},
+                {"matrix": [2, 13], "x": 13, "y": 1},
+                {"matrix": [2, 14], "x": 14, "y": 1},
+                {"matrix": [2, 15], "x": 15, "y": 1},
+                {"matrix": [0, 11], "x": 16, "y": 1},
+                {"matrix": [0, 15], "x": 17, "y": 1},
+                {"matrix": [6, 15], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+                {"matrix": [3, 15], "x": 16, "y": 2},
+                {"matrix": [0, 13], "x": 17, "y": 2},
+                {"matrix": [6, 13], "x": 18, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3},
+                {"matrix": [4, 2], "x": 2.75, "y": 3},
+                {"matrix": [4, 3], "x": 3.75, "y": 3},
+                {"matrix": [4, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 5], "x": 5.75, "y": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 3},
+                {"matrix": [4, 7], "x": 7.75, "y": 3},
+                {"matrix": [4, 8], "x": 8.75, "y": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 3},
+                {"matrix": [4, 10], "x": 10.75, "y": 3},
+                {"matrix": [4, 11], "x": 11.75, "y": 3},
+                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 13], "x": 15, "y": 3},
+                {"matrix": [4, 14], "x": 16, "y": 3},
+                {"matrix": [4, 15], "x": 17, "y": 3},
+                {"matrix": [6, 14], "x": 18, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4},
+                {"matrix": [5, 2], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4},
+                {"matrix": [5, 7], "x": 7.25, "y": 4},
+                {"matrix": [5, 8], "x": 8.25, "y": 4},
+                {"matrix": [5, 9], "x": 9.25, "y": 4},
+                {"matrix": [5, 10], "x": 10.25, "y": 4},
+                {"matrix": [5, 11], "x": 11.25, "y": 4},
+                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "y": 4},
+                {"matrix": [5, 14], "x": 15, "y": 4},
+                {"matrix": [5, 15], "x": 16, "y": 4},
+                {"matrix": [0, 14], "x": 17, "y": 4},
+                {"matrix": [0, 7], "x": 18, "y": 4},
+
+                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [6, 10], "x": 16, "y": 5},
+                {"matrix": [6, 11], "x": 17, "y": 5},
+                {"matrix": [6, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_rwkl_split_num_plus_enter": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [1, 6], "x": 6, "y": 0},
+                {"matrix": [1, 7], "x": 7, "y": 0},
+                {"matrix": [1, 8], "x": 8, "y": 0},
+                {"matrix": [1, 9], "x": 9, "y": 0},
+                {"matrix": [1, 10], "x": 10, "y": 0},
+                {"matrix": [1, 11], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [1, 15], "x": 15, "y": 0},
+                {"matrix": [0, 9], "x": 16, "y": 0},
+                {"matrix": [0, 10], "x": 17, "y": 0},
+                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
+                {"matrix": [2, 7], "x": 7, "y": 1},
+                {"matrix": [2, 8], "x": 8, "y": 1},
+                {"matrix": [2, 9], "x": 9, "y": 1},
+                {"matrix": [2, 10], "x": 10, "y": 1},
+                {"matrix": [2, 11], "x": 11, "y": 1},
+                {"matrix": [2, 12], "x": 12, "y": 1},
+                {"matrix": [2, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 15], "x": 15, "y": 1},
+                {"matrix": [0, 11], "x": 16, "y": 1},
+                {"matrix": [0, 15], "x": 17, "y": 1},
+                {"matrix": [6, 15], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+                {"matrix": [3, 15], "x": 16, "y": 2},
+                {"matrix": [0, 13], "x": 17, "y": 2},
+                {"matrix": [6, 13], "x": 18, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3},
+                {"matrix": [4, 2], "x": 2.75, "y": 3},
+                {"matrix": [4, 3], "x": 3.75, "y": 3},
+                {"matrix": [4, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 5], "x": 5.75, "y": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 3},
+                {"matrix": [4, 7], "x": 7.75, "y": 3},
+                {"matrix": [4, 8], "x": 8.75, "y": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 3},
+                {"matrix": [4, 10], "x": 10.75, "y": 3},
+                {"matrix": [4, 11], "x": 11.75, "y": 3},
+                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 13], "x": 15, "y": 3},
+                {"matrix": [4, 14], "x": 16, "y": 3},
+                {"matrix": [4, 15], "x": 17, "y": 3},
+                {"matrix": [6, 14], "x": 18, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4},
+                {"matrix": [5, 7], "x": 7.25, "y": 4},
+                {"matrix": [5, 8], "x": 8.25, "y": 4},
+                {"matrix": [5, 9], "x": 9.25, "y": 4},
+                {"matrix": [5, 10], "x": 10.25, "y": 4},
+                {"matrix": [5, 11], "x": 11.25, "y": 4},
+                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "y": 4},
+                {"matrix": [5, 14], "x": 15, "y": 4},
+                {"matrix": [5, 15], "x": 16, "y": 4},
+                {"matrix": [0, 14], "x": 17, "y": 4},
+                {"matrix": [0, 7], "x": 18, "y": 4},
+
+                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [6, 10], "x": 16, "y": 5},
+                {"matrix": [6, 11], "x": 17, "y": 5},
+                {"matrix": [6, 12], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_rwkl_split_bs_num_plus_enter": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [1, 2], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [1, 5], "x": 5, "y": 0},
+                {"matrix": [1, 6], "x": 6, "y": 0},
+                {"matrix": [1, 7], "x": 7, "y": 0},
+                {"matrix": [1, 8], "x": 8, "y": 0},
+                {"matrix": [1, 9], "x": 9, "y": 0},
+                {"matrix": [1, 10], "x": 10, "y": 0},
+                {"matrix": [1, 11], "x": 11, "y": 0},
+                {"matrix": [1, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 14, "y": 0},
+                {"matrix": [1, 15], "x": 15, "y": 0},
+                {"matrix": [0, 9], "x": 16, "y": 0},
+                {"matrix": [0, 10], "x": 17, "y": 0},
+                {"matrix": [0, 12], "x": 18, "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": [2, 6], "x": 6, "y": 1},
+                {"matrix": [2, 7], "x": 7, "y": 1},
+                {"matrix": [2, 8], "x": 8, "y": 1},
+                {"matrix": [2, 9], "x": 9, "y": 1},
+                {"matrix": [2, 10], "x": 10, "y": 1},
+                {"matrix": [2, 11], "x": 11, "y": 1},
+                {"matrix": [2, 12], "x": 12, "y": 1},
+                {"matrix": [2, 13], "x": 13, "y": 1},
+                {"matrix": [2, 14], "x": 14, "y": 1},
+                {"matrix": [2, 15], "x": 15, "y": 1},
+                {"matrix": [0, 11], "x": 16, "y": 1},
+                {"matrix": [0, 15], "x": 17, "y": 1},
+                {"matrix": [6, 15], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 2},
+                {"matrix": [3, 10], "x": 10.5, "y": 2},
+                {"matrix": [3, 11], "x": 11.5, "y": 2},
+                {"matrix": [3, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 14], "x": 15, "y": 2},
+                {"matrix": [3, 15], "x": 16, "y": 2},
+                {"matrix": [0, 13], "x": 17, "y": 2},
+                {"matrix": [6, 13], "x": 18, "y": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 3},
+                {"matrix": [4, 2], "x": 2.75, "y": 3},
+                {"matrix": [4, 3], "x": 3.75, "y": 3},
+                {"matrix": [4, 4], "x": 4.75, "y": 3},
+                {"matrix": [4, 5], "x": 5.75, "y": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 3},
+                {"matrix": [4, 7], "x": 7.75, "y": 3},
+                {"matrix": [4, 8], "x": 8.75, "y": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 3},
+                {"matrix": [4, 10], "x": 10.75, "y": 3},
+                {"matrix": [4, 11], "x": 11.75, "y": 3},
+                {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 13], "x": 15, "y": 3},
+                {"matrix": [4, 14], "x": 16, "y": 3},
+                {"matrix": [4, 15], "x": 17, "y": 3},
+                {"matrix": [6, 14], "x": 18, "y": 3},
+
+                {"matrix": [5, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [5, 4], "x": 4.25, "y": 4},
+                {"matrix": [5, 5], "x": 5.25, "y": 4},
+                {"matrix": [5, 6], "x": 6.25, "y": 4},
+                {"matrix": [5, 7], "x": 7.25, "y": 4},
+                {"matrix": [5, 8], "x": 8.25, "y": 4},
+                {"matrix": [5, 9], "x": 9.25, "y": 4},
+                {"matrix": [5, 10], "x": 10.25, "y": 4},
+                {"matrix": [5, 11], "x": 11.25, "y": 4},
+                {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [5, 13], "x": 14, "y": 4},
+                {"matrix": [5, 14], "x": 15, "y": 4},
+                {"matrix": [5, 15], "x": 16, "y": 4},
+                {"matrix": [0, 14], "x": 17, "y": 4},
+                {"matrix": [0, 7], "x": 18, "y": 4},
+
+                {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [6, 6], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5},
+                {"matrix": [6, 10], "x": 16, "y": 5},
+                {"matrix": [6, 11], "x": 17, "y": 5},
+                {"matrix": [6, 12], "x": 18, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk
index dfe1d12b556..8784813b335 100644
--- a/keyboards/amjkeyboard/amj96/rules.mk
+++ b/keyboards/amjkeyboard/amj96/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = 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
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/amjkeyboard/amjpad/keyboard.json b/keyboards/amjkeyboard/amjpad/keyboard.json
index bd960d8c8ab..e331f3af191 100644
--- a/keyboards/amjkeyboard/amjpad/keyboard.json
+++ b/keyboards/amjkeyboard/amjpad/keyboard.json
@@ -17,6 +17,12 @@
     "mousekey": false,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F1", "F0", "E6", "C7"],
     "rows": ["F7", "F6", "F5", "F4", "D5", "D0"]
diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
deleted file mode 100644
index 551d059badf..00000000000
--- a/keyboards/anavi/knob1/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "keyboard_name": "Knob 1",
-    "manufacturer": "ANAVI",
-    "url": "https://github.com/AnaviTechnology/anavi-knob-1",
-    "maintainer": "leon-anavi",
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "rgblight": {
-        "led_count": 1,
-        "hue_steps": 10,
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_swirl"
-        }
-    },
-    "ws2812": {
-        "pin": "GP12",
-        "driver": "vendor"
-    },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}
-        ]
-    },
-    "matrix_pins": {
-        "direct": [
-            ["GP26"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT_k1": {
-            "layout": [
-                {"x": 0, "y": 0, "matrix": [0, 0]}
-            ]
-        }
-    },
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x9A25",
-        "vid": "0xFEED"
-    }
-}
diff --git a/keyboards/anavi/knob1/keyboard.json b/keyboards/anavi/knob1/keyboard.json
new file mode 100644
index 00000000000..9c4c60640ee
--- /dev/null
+++ b/keyboards/anavi/knob1/keyboard.json
@@ -0,0 +1,64 @@
+{
+    "keyboard_name": "Knob 1",
+    "manufacturer": "ANAVI",
+    "url": "https://github.com/AnaviTechnology/anavi-knob-1",
+    "maintainer": "leon-anavi",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "rgblight": {
+        "led_count": 1,
+        "hue_steps": 10,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
+        }
+    },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP26"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT_k1": {
+            "layout": [
+                {"x": 0, "y": 0, "matrix": [0, 0]}
+            ]
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x9A25",
+        "vid": "0xFEED"
+    }
+}
diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/anavi/knob1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
deleted file mode 100644
index ad51b7ce6ca..00000000000
--- a/keyboards/anavi/knobs3/info.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "keyboard_name": "Knobs 3",
-    "manufacturer": "ANAVI",
-    "url": "https://github.com/AnaviTechnology/anavi-knobs-3",
-    "maintainer": "leon-anavi",
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "matrix_pins": {
-        "direct": [
-            ["GP26", "GP29", "GP0"]
-        ]
-    },
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": true,
-        "rgblight": true
-    },
-    "rgblight": {
-        "led_count": 1,
-        "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 255,
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "GP12",
-        "driver": "vendor"
-    },
-    "encoder": {
-    "enabled": true,
-        "rotary": [
-            {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2},
-            {"pin_a": "GP4", "pin_b": "GP3", "resolution": 2},
-            {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2}
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
-                {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
-                {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
-            ]
-        }
-    },
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x9A25",
-        "vid": "0xFEED"
-    }
-}
diff --git a/keyboards/anavi/knobs3/keyboard.json b/keyboards/anavi/knobs3/keyboard.json
new file mode 100644
index 00000000000..11081ee0863
--- /dev/null
+++ b/keyboards/anavi/knobs3/keyboard.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "Knobs 3",
+    "manufacturer": "ANAVI",
+    "url": "https://github.com/AnaviTechnology/anavi-knobs-3",
+    "maintainer": "leon-anavi",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            ["GP26", "GP29", "GP0"]
+        ]
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true
+    },
+    "rgblight": {
+        "led_count": 1,
+        "hue_steps": 10,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+        "max_brightness": 255,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "GP12",
+        "driver": "vendor"
+    },
+    "encoder": {
+    "enabled": true,
+        "rotary": [
+            {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2},
+            {"pin_a": "GP4", "pin_b": "GP3", "resolution": 2},
+            {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
+                {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
+            ]
+        }
+    },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x9A25",
+        "vid": "0xFEED"
+    }
+}
diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/anavi/knobs3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/annepro2/annepro2_ble.h b/keyboards/annepro2/annepro2_ble.h
index 0cfb68e0716..37dd6d31a1c 100644
--- a/keyboards/annepro2/annepro2_ble.h
+++ b/keyboards/annepro2/annepro2_ble.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include "annepro2.h"
-#include "quantum.h"
 
 void annepro2_ble_bootload(void);
 void annepro2_ble_startup(void);
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/keyboard.json
similarity index 100%
rename from keyboards/annepro2/c15/info.json
rename to keyboards/annepro2/c15/keyboard.json
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/keyboard.json
similarity index 100%
rename from keyboards/annepro2/c18/info.json
rename to keyboards/annepro2/c18/keyboard.json
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
deleted file mode 100644
index fff04f05b3c..00000000000
--- a/keyboards/ano/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Sebastien Sauve-Hoover (@sauvehoo)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ano/keyboard.json b/keyboards/ano/keyboard.json
index c522f816ce5..e676ce72707 100644
--- a/keyboards/ano/keyboard.json
+++ b/keyboards/ano/keyboard.json
@@ -28,7 +28,11 @@
         ]
     },
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
deleted file mode 100644
index 947f85bbb2b..00000000000
--- a/keyboards/anomalykb/a65i/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Lfgberg
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/anomalykb/a65i/keyboard.json b/keyboards/anomalykb/a65i/keyboard.json
index 98015fcd72b..8fadaadadb2 100644
--- a/keyboards/anomalykb/a65i/keyboard.json
+++ b/keyboards/anomalykb/a65i/keyboard.json
@@ -15,6 +15,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"],
         "rows": ["B3", "B2", "B1", "B0", "B5"]
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
deleted file mode 100644
index 66790ac3d39..00000000000
--- a/keyboards/aos/tkl/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 aholland909
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aos/tkl/keyboard.json b/keyboards/aos/tkl/keyboard.json
index 730a262366a..8cd47a44a54 100644
--- a/keyboards/aos/tkl/keyboard.json
+++ b/keyboards/aos/tkl/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
         "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
deleted file mode 100644
index 14d0c01cb9e..00000000000
--- a/keyboards/arabica37/rev1/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "keyboard_name": "Arabica3/7",
-    "manufacturer": "CalciumNitride",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "led_count": 50,
-        "split_count": [25, 25]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0.75},
-                {"matrix": [0, 1], "x": 1.25, "y": 0.75},
-                {"matrix": [0, 2], "x": 2.25, "y": 0.25},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.25, "y": 0.5},
-
-                {"matrix": [4, 5], "x": 9, "y": 0.5},
-                {"matrix": [4, 4], "x": 10, "y": 0.25},
-                {"matrix": [4, 3], "x": 11, "y": 0},
-                {"matrix": [4, 2], "x": 12, "y": 0.25},
-                {"matrix": [4, 1], "x": 13, "y": 0.75},
-                {"matrix": [4, 0], "x": 14, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.75},
-                {"matrix": [1, 1], "x": 1.25, "y": 1.75},
-                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
-
-                {"matrix": [5, 5], "x": 9, "y": 1.5},
-                {"matrix": [5, 4], "x": 10, "y": 1.25},
-                {"matrix": [5, 3], "x": 11, "y": 1},
-                {"matrix": [5, 2], "x": 12, "y": 1.25},
-                {"matrix": [5, 1], "x": 13, "y": 1.75},
-                {"matrix": [5, 0], "x": 14, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2.75},
-                {"matrix": [2, 1], "x": 1.25, "y": 2.75},
-                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.25, "y": 2.5},
-
-                {"matrix": [6, 5], "x": 9, "y": 2.5},
-                {"matrix": [6, 4], "x": 10, "y": 2.25},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 2], "x": 12, "y": 2.25},
-                {"matrix": [6, 1], "x": 13, "y": 2.75},
-                {"matrix": [6, 0], "x": 14, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
-                {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5},
-                {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25},
-
-                {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25},
-                {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5},
-                {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25},
-
-                {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25},
-
-                {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/arabica37/rev1/keyboard.json b/keyboards/arabica37/rev1/keyboard.json
new file mode 100644
index 00000000000..710a377ab9a
--- /dev/null
+++ b/keyboards/arabica37/rev1/keyboard.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Arabica3/7",
+    "manufacturer": "CalciumNitride",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "led_count": 50,
+        "split_count": [25, 25]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0.75},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.75},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 9, "y": 0.5},
+                {"matrix": [4, 4], "x": 10, "y": 0.25},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.25},
+                {"matrix": [4, 1], "x": 13, "y": 0.75},
+                {"matrix": [4, 0], "x": 14, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.75},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.75},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 9, "y": 1.5},
+                {"matrix": [5, 4], "x": 10, "y": 1.25},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.25},
+                {"matrix": [5, 1], "x": 13, "y": 1.75},
+                {"matrix": [5, 0], "x": 14, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.75},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.75},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.5},
+
+                {"matrix": [6, 5], "x": 9, "y": 2.5},
+                {"matrix": [6, 4], "x": 10, "y": 2.25},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.25},
+                {"matrix": [6, 1], "x": 13, "y": 2.75},
+                {"matrix": [6, 0], "x": 14, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5},
+                {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25},
+
+                {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25},
+                {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25},
+
+                {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25},
+
+                {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk
deleted file mode 100644
index 822a7cf01cb..00000000000
--- a/keyboards/arabica37/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
deleted file mode 100644
index eeeb33f236f..00000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
- {
-    "manufacturer": "Argo Works",
-    "keyboard_name": "Ishi 80 Mk 0",
-    "maintainer": "jasonj2232",
-    "development_board": "elite_c",
-    "pin_compatible": "elite_c",
-    "diode_direction": "COL2ROW",
-    "url": "https://qmk.fm/keyboards/",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x4930",
-        "vid": "0x4157"
-    },
-    "bootmagic": {
-        "matrix": [1, 0]
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true
-    },
-    "matrix_pins": {
-        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
-        "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [1, 2], "x": 5.25, "y": 0},
-                {"matrix": [0, 2], "x": 6.25, "y": 0},
-                {"matrix": [1, 3], "x": 7.25, "y": 0},
-                {"matrix": [0, 3], "x": 8.25, "y": 0},
-                {"matrix": [1, 4], "x": 9.25, "y": 0},
-                {"matrix": [0, 4], "x": 10.25, "y": 0},
-                {"matrix": [1, 5], "x": 11.25, "y": 0},
-                {"matrix": [0, 5], "x": 12.25, "y": 0},
-                {"matrix": [1, 6], "x": 13.25, "y": 0},
-                {"matrix": [0, 6], "x": 14.25, "y": 0},
-                {"matrix": [1, 7], "x": 15.25, "y": 0},
-                {"matrix": [0, 7], "x": 16.25, "y": 0},
-                {"matrix": [1, 8], "x": 17.25, "y": 0},
-                {"matrix": [0, 8], "x": 18.25, "y": 0, "w": 2},
-                {"matrix": [3, 0], "x": 0, "y": 1, "h": 2},
-                {"matrix": [2, 0], "x": 1, "y": 1},
-                {"matrix": [3, 1], "x": 2, "y": 1},
-                {"matrix": [2, 1], "x": 3, "y": 1},
-                {"matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5},
-                {"matrix": [2, 2], "x": 6.75, "y": 1},
-                {"matrix": [3, 3], "x": 7.75, "y": 1},
-                {"matrix": [2, 3], "x": 8.75, "y": 1},
-                {"matrix": [3, 4], "x": 9.75, "y": 1},
-                {"matrix": [2, 4], "x": 10.75, "y": 1},
-                {"matrix": [3, 5], "x": 11.75, "y": 1},
-                {"matrix": [2, 5], "x": 12.75, "y": 1},
-                {"matrix": [3, 6], "x": 13.75, "y": 1},
-                {"matrix": [2, 6], "x": 14.75, "y": 1},
-                {"matrix": [3, 7], "x": 15.75, "y": 1},
-                {"matrix": [2, 7], "x": 16.75, "y": 1},
-                {"matrix": [3, 8], "x": 17.75, "y": 1},
-                {"matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5},
-                {"matrix": [4, 0], "x": 1, "y": 2},
-                {"matrix": [5, 1], "x": 2, "y": 2},
-                {"matrix": [4, 1], "x": 3, "y": 2},
-                {"matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75},
-                {"matrix": [4, 2], "x": 7, "y": 2},
-                {"matrix": [5, 3], "x": 8, "y": 2},
-                {"matrix": [4, 3], "x": 9, "y": 2},
-                {"matrix": [5, 4], "x": 10, "y": 2},
-                {"matrix": [4, 4], "x": 11, "y": 2},
-                {"matrix": [5, 5], "x": 12, "y": 2},
-                {"matrix": [4, 5], "x": 13, "y": 2},
-                {"matrix": [5, 6], "x": 14, "y": 2},
-                {"matrix": [4, 6], "x": 15, "y": 2},
-                {"matrix": [5, 7], "x": 16, "y": 2},
-                {"matrix": [4, 7], "x": 17, "y": 2},
-                {"matrix": [4, 8], "x": 18, "y": 2, "w": 2.25},
-                {"matrix": [7, 0], "x": 0, "y": 3, "h": 2},
-                {"matrix": [6, 0], "x": 1, "y": 3},
-                {"matrix": [7, 1], "x": 2, "y": 3},
-                {"matrix": [6, 1], "x": 3, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25},
-                {"matrix": [7, 3], "x": 7.5, "y": 3},
-                {"matrix": [6, 3], "x": 8.5, "y": 3},
-                {"matrix": [7, 4], "x": 9.5, "y": 3},
-                {"matrix": [6, 4], "x": 10.5, "y": 3},
-                {"matrix": [7, 5], "x": 11.5, "y": 3},
-                {"matrix": [6, 5], "x": 12.5, "y": 3},
-                {"matrix": [7, 6], "x": 13.5, "y": 3},
-                {"matrix": [6, 6], "x": 14.5, "y": 3},
-                {"matrix": [7, 7], "x": 15.5, "y": 3},
-                {"matrix": [6, 7], "x": 16.5, "y": 3},
-                {"matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75},
-                {"matrix": [8, 0], "x": 1, "y": 4},
-                {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
-                {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [8, 4], "x": 9, "y": 4, "w": 6.25},
-                {"matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25},
-                {"matrix": [7, 8], "x": 19, "y": 4, "w": 1.25},
-                {"matrix": [8, 8], "x": 21.5, "y": 4}
-            ]
-        }
-    },
-    "encoder": {
-        "rotary": [
-                {"pin_a": "B7", "pin_b": "D5"}
-            ]
-    }
-}
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
new file mode 100644
index 00000000000..89b9b1994f2
--- /dev/null
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json
@@ -0,0 +1,122 @@
+ {
+    "manufacturer": "Argo Works",
+    "keyboard_name": "Ishi 80 Mk 0",
+    "maintainer": "jasonj2232",
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "diode_direction": "COL2ROW",
+    "url": "https://qmk.fm/keyboards/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4930",
+        "vid": "0x4157"
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "oled": true,
+        "wpm": true
+    },
+    "matrix_pins": {
+        "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
+        "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 3], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 4], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 5], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 6], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 7], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+                {"matrix": [0, 8], "x": 18.25, "y": 0, "w": 2},
+                {"matrix": [3, 0], "x": 0, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 2], "x": 5.25, "y": 1, "w": 1.5},
+                {"matrix": [2, 2], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 3], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 4], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 5], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 6], "x": 14.75, "y": 1},
+                {"matrix": [3, 7], "x": 15.75, "y": 1},
+                {"matrix": [2, 7], "x": 16.75, "y": 1},
+                {"matrix": [3, 8], "x": 17.75, "y": 1},
+                {"matrix": [2, 8], "x": 18.75, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 1], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 2], "x": 5.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 2], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 3], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 4], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 5], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 6], "x": 15, "y": 2},
+                {"matrix": [5, 7], "x": 16, "y": 2},
+                {"matrix": [4, 7], "x": 17, "y": 2},
+                {"matrix": [4, 8], "x": 18, "y": 2, "w": 2.25},
+                {"matrix": [7, 0], "x": 0, "y": 3, "h": 2},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 1], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 3], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 4], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 5], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 6], "x": 14.5, "y": 3},
+                {"matrix": [7, 7], "x": 15.5, "y": 3},
+                {"matrix": [6, 7], "x": 16.5, "y": 3},
+                {"matrix": [6, 8], "x": 17.5, "y": 3, "w": 2.75},
+                {"matrix": [8, 0], "x": 1, "y": 4},
+                {"matrix": [8, 1], "x": 2, "y": 4, "w": 2},
+                {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [6, 2], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 9, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 15.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 16.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25},
+                {"matrix": [7, 8], "x": 19, "y": 4, "w": 1.25},
+                {"matrix": [8, 8], "x": 21.5, "y": 4}
+            ]
+        }
+    },
+    "encoder": {
+        "rotary": [
+                {"pin_a": "B7", "pin_b": "D5"}
+            ]
+    }
+}
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
deleted file mode 100644
index 76e55c05f48..00000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/argyle/info.json b/keyboards/argyle/keyboard.json
similarity index 100%
rename from keyboards/argyle/info.json
rename to keyboards/argyle/keyboard.json
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
deleted file mode 100644
index 3cf449a32bf..00000000000
--- a/keyboards/arisu/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Fate
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/arisu/keyboard.json b/keyboards/arisu/keyboard.json
index af1cb819dc9..43bb668b990 100644
--- a/keyboards/arisu/keyboard.json
+++ b/keyboards/arisu/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
         "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/arrowmechanics/wings/config.h b/keyboards/arrowmechanics/wings/config.h
new file mode 100644
index 00000000000..bd58c470034
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/config.h
@@ -0,0 +1,11 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX
+
+#define AUDIO_PIN GP4
+#define AUDIO_PWM_DRIVER PWMD2
+#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
+#define AUDIO_INIT_DELAY
diff --git a/keyboards/arrowmechanics/wings/halconf.h b/keyboards/arrowmechanics/wings/halconf.h
new file mode 100644
index 00000000000..772f7982164
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
diff --git a/keyboards/arrowmechanics/wings/keyboard.json b/keyboards/arrowmechanics/wings/keyboard.json
new file mode 100644
index 00000000000..fca38314c9b
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/keyboard.json
@@ -0,0 +1,320 @@
+{
+    "manufacturer": "Arrow Mechanics",
+    "keyboard_name": "WINGS Mark 1",
+    "maintainer": "arrowmechanics",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP6", "pin_b": "GP7", "resolution": 2}
+        ]
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "breathing",
+            "hue": 192
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 7], "x": 93, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 80, "y": 1, "flags": 4},
+            {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 54, "y": 1, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 3, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+            {"matrix": [0, 0], "x": 3, "y": 5, "flags": 4},
+
+            {"matrix": [1, 0], "x": 3, "y": 17, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 54, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 67, "y": 12, "flags": 4},
+            {"matrix": [1, 6], "x": 80, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 93, "y": 14, "flags": 4},
+
+            {"matrix": [2, 8], "x": 106, "y": 25, "flags": 4},
+            {"matrix": [2, 7], "x": 93, "y": 25, "flags": 4},
+            {"matrix": [2, 6], "x": 80, "y": 25, "flags": 4},
+            {"matrix": [2, 5], "x": 67, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 25, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 29, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 29, "flags": 4},
+
+            {"matrix": [3, 0], "x": 3, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 54, "y": 36, "flags": 4},
+            {"matrix": [3, 5], "x": 67, "y": 35, "flags": 4},
+            {"matrix": [3, 6], "x": 80, "y": 36, "flags": 4},
+            {"matrix": [3, 7], "x": 93, "y": 37, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 37, "flags": 4},
+
+            {"matrix": [4, 8], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 93, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 80, "y": 48, "flags": 4},
+            {"matrix": [4, 5], "x": 67, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 54, "y": 48, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 50, "flags": 4},
+            {"matrix": [4, 1], "x": 21, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
+
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 13, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 26, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 43, "y": 62, "flags": 4},
+            {"matrix": [5, 4], "x": 59, "y": 60, "flags": 4},
+            {"matrix": [5, 6], "x": 75, "y": 60, "flags": 4},
+            {"matrix": [5, 7], "x": 98, "y": 61, "flags": 4},
+
+            {"matrix": [6, 1], "x": 131, "y": 2, "flags": 4},
+            {"matrix": [6, 2], "x": 144, "y": 1, "flags": 4},
+            {"matrix": [6, 3], "x": 157, "y": 0, "flags": 4},
+            {"matrix": [6, 4], "x": 170, "y": 1, "flags": 4},
+            {"matrix": [6, 5], "x": 182, "y": 3, "flags": 4},
+            {"matrix": [6, 6], "x": 195, "y": 5, "flags": 4},
+            {"matrix": [6, 7], "x": 208, "y": 5, "flags": 4},
+            {"matrix": [6, 8], "x": 221, "y": 5, "flags": 4},
+
+            {"matrix": [7, 8], "x": 214, "y": 17, "flags": 4},
+            {"matrix": [7, 6], "x": 195, "y": 17, "flags": 4},
+            {"matrix": [7, 5], "x": 182, "y": 15, "flags": 4},
+            {"matrix": [7, 4], "x": 170, "y": 13, "flags": 4},
+            {"matrix": [7, 3], "x": 157, "y": 12, "flags": 4},
+            {"matrix": [7, 2], "x": 144, "y": 13, "flags": 4},
+            {"matrix": [7, 1], "x": 131, "y": 14, "flags": 4},
+
+            {"matrix": [8, 0], "x": 118, "y": 25, "flags": 4},
+            {"matrix": [8, 1], "x": 131, "y": 25, "flags": 4},
+            {"matrix": [8, 2], "x": 144, "y": 25, "flags": 4},
+            {"matrix": [8, 3], "x": 157, "y": 24, "flags": 4},
+            {"matrix": [8, 4], "x": 170, "y": 25, "flags": 4},
+            {"matrix": [8, 5], "x": 182, "y": 27, "flags": 4},
+            {"matrix": [8, 6], "x": 195, "y": 29, "flags": 4},
+            {"matrix": [8, 7], "x": 208, "y": 29, "flags": 4},
+            {"matrix": [8, 8], "x": 221, "y": 29, "flags": 4},
+
+            {"matrix": [9, 8], "x": 216, "y": 40, "flags": 4},
+            {"matrix": [9, 6], "x": 195, "y": 40, "flags": 4},
+            {"matrix": [9, 5], "x": 182, "y": 38, "flags": 4},
+            {"matrix": [9, 4], "x": 170, "y": 36, "flags": 4},
+            {"matrix": [9, 3], "x": 157, "y": 35, "flags": 4},
+            {"matrix": [9, 2], "x": 144, "y": 36, "flags": 4},
+            {"matrix": [9, 1], "x": 131, "y": 37, "flags": 4},
+            {"matrix": [9, 0], "x": 118, "y": 37, "flags": 4},
+
+            {"matrix": [10, 0], "x": 118, "y": 49, "flags": 4},
+            {"matrix": [10, 1], "x": 131, "y": 49, "flags": 4},
+            {"matrix": [10, 2], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [10, 3], "x": 157, "y": 47, "flags": 4},
+            {"matrix": [10, 4], "x": 170, "y": 48, "flags": 4},
+            {"matrix": [10, 5], "x": 182, "y": 50, "flags": 4},
+            {"matrix": [10, 6], "x": 197, "y": 52, "flags": 4},
+            {"matrix": [10, 7], "x": 211, "y": 52, "flags": 4},
+            {"matrix": [10, 8], "x": 224, "y": 52, "flags": 4},
+
+            {"matrix": [11, 8], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [11, 7], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [11, 6], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [11, 5], "x": 181, "y": 62, "flags": 4},
+            {"matrix": [11, 4], "x": 165, "y": 60, "flags": 4},
+            {"matrix": [11, 2], "x": 149, "y": 60, "flags": 4},
+            {"matrix": [11, 1], "x": 126, "y": 61, "flags": 4}
+        ],
+        "split_count": [47, 48]
+    },
+    "split": {
+        "enabled": true,
+        "transport": {
+            "sync": {
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
+    },
+    "tags": ["columnar", "split", "rgb", "hotswap", "encoder"],
+    "url": "https://arrowmechanics.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3134",
+        "vid": "0xA880"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP26"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0.43},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.43},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.43},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.08},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0.08},
+                {"matrix": [0, 7], "x": 7.25, "y": 0.15},
+
+                {"matrix": [6, 1], "x": 10.45, "y": 0.15},
+                {"matrix": [6, 2], "x": 11.45, "y": 0.08},
+                {"matrix": [6, 3], "x": 12.45, "y": 0},
+                {"matrix": [6, 4], "x": 13.45, "y": 0.08},
+                {"matrix": [6, 5], "x": 14.45, "y": 0.25},
+                {"matrix": [6, 6], "x": 15.45, "y": 0.43},
+                {"matrix": [6, 7], "x": 16.45, "y": 0.43},
+                {"matrix": [6, 8], "x": 17.45, "y": 0.43},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.43},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.43},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.43},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.08},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.08},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.15},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0},
+
+                {"matrix": [7, 0], "x": 9.45, "y": 1.15},
+                {"matrix": [7, 1], "x": 10.45, "y": 1.15},
+                {"matrix": [7, 2], "x": 11.45, "y": 1.08},
+                {"matrix": [7, 3], "x": 12.45, "y": 1},
+                {"matrix": [7, 4], "x": 13.45, "y": 1.08},
+                {"matrix": [7, 5], "x": 14.45, "y": 1.25},
+                {"matrix": [7, 6], "x": 15.45, "y": 1.43},
+                {"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.08},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.08},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.15},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.15},
+
+                {"matrix": [8, 0], "x": 9.45, "y": 2.15},
+                {"matrix": [8, 1], "x": 10.45, "y": 2.15},
+                {"matrix": [8, 2], "x": 11.45, "y": 2.08},
+                {"matrix": [8, 3], "x": 12.45, "y": 2},
+                {"matrix": [8, 4], "x": 13.45, "y": 2.08},
+                {"matrix": [8, 5], "x": 14.45, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.45, "y": 2.43},
+                {"matrix": [8, 7], "x": 16.45, "y": 2.43},
+                {"matrix": [8, 8], "x": 17.45, "y": 2.43},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.08},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.08},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.15},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.15},
+
+                {"matrix": [9, 0], "x": 9.45, "y": 3.15},
+                {"matrix": [9, 1], "x": 10.45, "y": 3.15},
+                {"matrix": [9, 2], "x": 11.45, "y": 3.08},
+                {"matrix": [9, 3], "x": 12.45, "y": 3},
+                {"matrix": [9, 4], "x": 13.45, "y": 3.08},
+                {"matrix": [9, 5], "x": 14.45, "y": 3.25},
+                {"matrix": [9, 6], "x": 15.45, "y": 3.43},
+                {"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.43},
+                {"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.08},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.08},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.15},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.15},
+
+                {"matrix": [10, 0], "x": 9.45, "y": 4.15},
+                {"matrix": [10, 1], "x": 10.45, "y": 4.15},
+                {"matrix": [10, 2], "x": 11.45, "y": 4.08},
+                {"matrix": [10, 3], "x": 12.45, "y": 4},
+                {"matrix": [10, 4], "x": 13.45, "y": 4.08},
+                {"matrix": [10, 5], "x": 14.45, "y": 4.25},
+                {"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25},
+                {"matrix": [10, 7], "x": 16.7, "y": 4.43},
+                {"matrix": [10, 8], "x": 17.7, "y": 4.43},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.43},
+                {"matrix": [5, 1], "x": 1, "y": 5.43},
+                {"matrix": [5, 2], "x": 2, "y": 5.43},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25},
+
+                {"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25},
+                {"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 15.7, "y": 5.43},
+                {"matrix": [11, 7], "x": 16.7, "y": 5.43},
+                {"matrix": [11, 8], "x": 17.7, "y": 5.43}
+            ]
+        }
+    }
+}
diff --git a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
new file mode 100644
index 00000000000..949219b820b
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+        KC_VOLU, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,                            KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_EQL,   KC_PSCR,  KC_DEL,
+        KC_VOLD, KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,   RGB_MOD,        KC_BTN1,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,       KC_BSPC,
+        KC_MPLY,       KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,   C(KC_C),        C(KC_V),  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_MNXT,      KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,     KC_G,   C(KC_Z),        C(KC_Y),  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,
+        KC_MPRV,      KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,   KC_ENT,         KC_ENT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,    KC_HOME,
+        KC_LCTL, KC_NO,   KC_NO,            KC_LCTL, KC_LCMD, KC_LALT,      KC_SPC,                  KC_SPC,       KC_RALT, KC_RCMD, KC_RCTL,          KC_LEFT,  KC_DOWN,  KC_RGHT
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [BASE] =   { ENCODER_CCW_CW(RGB_HUI, RGB_HUD), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+};
+#endif
diff --git a/keyboards/arrowmechanics/wings/keymaps/default/rules.mk b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/arrowmechanics/wings/mcuconf.h b/keyboards/arrowmechanics/wings/mcuconf.h
new file mode 100644
index 00000000000..80214c1bbd8
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Filip Strzałka (@philvec)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM2
+#define RP_PWM_USE_PWM2 TRUE
diff --git a/keyboards/arrowmechanics/wings/readme.md b/keyboards/arrowmechanics/wings/readme.md
new file mode 100644
index 00000000000..8f167174e3d
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/readme.md
@@ -0,0 +1,29 @@
+# Arrow Mechanics WINGS Mark 1
+
+![Arrow Mechanics WINGS Mark 1](https://i.imgur.com/oQkDmSu.png)
+
+ErgoDox-inspired SPLIT keyboard by [Arrow Mechanics](https://www.arrowmechanics.com/)
+	
+* 94 GATERON Low Profile 2.0 hotswap sockets
+* RGB diode under each key for WS2812-driven lighting with [RGB Matrix](https://docs.qmk.fm/#/feature_rgb_matrix)
+* 2 rotary encoders, one per half, with push-switches
+* Buzzers for sound effects and/or [Music Mode](https://docs.qmk.fm/#/feature_audio?id=music-mode)
+* Handy magnetic connectors for joining the halves together or splitting with the use of dedicated cable
+* Anti-slip pads with magnetic expanding-legs for conveniently adjusting height/lean
+* RP2040 Chip + 16MB Flash memory - Dual-core Cortex M0+
+---
+* Keyboard Maintainer: [arrowmechanics](https://github.com/arrowmechanics/)
+* Hardware Supported: [Arrow Mechanics WINGS Keyboard set](https://www.arrowmechanics.com/produkty?view=product&id=8)
+* Hardware Availability: [Official Arrow Mechanics E-SHOP](https://www.arrowmechanics.com/produkty?view=product&id=8)
+
+Flashing example for this keyboard:
+
+    qmk flash -kb arrowmechanics/wings -km default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+* **Bootmagic reset**: Hold down the top-left corner key on power-up.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk
new file mode 100644
index 00000000000..22ce54190c8
--- /dev/null
+++ b/keyboards/arrowmechanics/wings/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/keyboard.json
similarity index 100%
rename from keyboards/artifact/lvl/rev_hs01/info.json
rename to keyboards/artifact/lvl/rev_hs01/keyboard.json
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
deleted file mode 100644
index 75e72d0e22a..00000000000
--- a/keyboards/ash1800/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 angelbirth
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ash1800/keyboard.json b/keyboards/ash1800/keyboard.json
index 9e60de6b343..c2244a7ad70 100644
--- a/keyboards/ash1800/keyboard.json
+++ b/keyboards/ash1800/keyboard.json
@@ -21,6 +21,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
         "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
deleted file mode 100644
index 08dd2458c88..00000000000
--- a/keyboards/ash_xiix/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 sh_xguitar
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/keyboard.json b/keyboards/ash_xiix/keyboard.json
index d1e32efec13..5cb21b488e9 100644
--- a/keyboards/ash_xiix/keyboard.json
+++ b/keyboards/ash_xiix/keyboard.json
@@ -22,6 +22,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
         "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
diff --git a/keyboards/ask55/config.h b/keyboards/ask55/config.h
deleted file mode 100644
index f16fa8823e2..00000000000
--- a/keyboards/ask55/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2022 Yiancar / Keyboard-Magpie
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ask55/keyboard.json b/keyboards/ask55/keyboard.json
index d47d79612d3..66efb1749ae 100644
--- a/keyboards/ask55/keyboard.json
+++ b/keyboards/ask55/keyboard.json
@@ -13,6 +13,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
         "rows": ["B0", "B1", "D1", "F6", "F5"]
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index 70ad2757b92..ff79c3f7f89 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -23,12 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json
deleted file mode 100644
index 97f38080dc7..00000000000
--- a/keyboards/at_at/660m/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "660M",
-    "manufacturer": "AT-AT",
-    "url": "",
-    "maintainer": "adrientetar",
-    "usb": {
-        "vid": "0xA22A",
-        "pid": "0x6600",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
-        "rows": ["A3", "A4", "A5", "A0", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-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, "w": 2},
-
-                {"matrix": [0, 15], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 15], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.5, "y": 4},
-                {"matrix": [4, 14], "x": 14.5, "y": 4},
-                {"matrix": [4, 15], "x": 15.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/at_at/660m/keyboard.json b/keyboards/at_at/660m/keyboard.json
new file mode 100644
index 00000000000..a9c5af73f85
--- /dev/null
+++ b/keyboards/at_at/660m/keyboard.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "660M",
+    "manufacturer": "AT-AT",
+    "url": "",
+    "maintainer": "adrientetar",
+    "usb": {
+        "vid": "0xA22A",
+        "pid": "0x6600",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"],
+        "rows": ["A3", "A4", "A5", "A0", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-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, "w": 2},
+
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 15], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4},
+                {"matrix": [4, 14], "x": 14.5, "y": 4},
+                {"matrix": [4, 15], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk
deleted file mode 100644
index e984f8dc96e..00000000000
--- a/keyboards/at_at/660m/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes
-# RGBLIGHT_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369
-
-
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 374119935e9..ab111a5ec5f 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,10 +16,4 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define RGB_MATRIX_LED_COUNT 96
diff --git a/keyboards/atlantis/ak81_ve/keyboard.json b/keyboards/atlantis/ak81_ve/keyboard.json
index 6b618646443..a2d064295c8 100644
--- a/keyboards/atlantis/ak81_ve/keyboard.json
+++ b/keyboards/atlantis/ak81_ve/keyboard.json
@@ -74,6 +74,12 @@
         "nkro": true,
         "rgb_matrix": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
         "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
deleted file mode 100644
index ac8f979d399..00000000000
--- a/keyboards/atlantis/ps17/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "manufacturer": "Atlantis",
-    "keyboard_name": "PS17",
-    "maintainer": "mjbogusz",
-    "url": "https://qmk.fm/keyboards/",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x414B",
-        "vid": "0x0015"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "encoder": true,
-        "rgb_matrix": true
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["F6", "F7", "D3", "D6"],
-        "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D1"}
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.5},
-                {"matrix": [3, 2], "x": 2, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5},
-                {"matrix": [4, 1], "x": 1, "y": 4.5},
-                {"matrix": [4, 2], "x": 2, "y": 4.5},
-                {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
-                {"matrix": [5, 2], "x": 2, "y": 5.5}
-            ]
-        }
-    },
-    "rgb_matrix": {
-        "animations": {
-            "cycle_all": true,
-            "cycle_pinwheel": true,
-            "rainbow_beacon": true,
-            "pixel_rain": true
-        },
-        "driver": "ws2812",
-        "center_point": [126, 126],
-        "layout": [
-            {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
-            {"flags": 4, "matrix": [1, 1], "x": 108, "y": 165},
-            {"flags": 4, "matrix": [1, 2], "x": 144, "y": 165},
-            {"flags": 4, "matrix": [1, 3], "x": 179, "y": 165},
-            {"flags": 4, "matrix": [2, 0], "x": 74, "y": 129},
-            {"flags": 4, "matrix": [2, 1], "x": 109, "y": 129},
-            {"flags": 4, "matrix": [2, 2], "x": 143, "y": 129},
-            {"flags": 4, "matrix": [2, 3], "x": 188, "y": 121},
-            {"flags": 4, "matrix": [3, 0], "x": 74, "y": 95},
-            {"flags": 4, "matrix": [3, 1], "x": 109, "y": 95},
-            {"flags": 4, "matrix": [3, 2], "x": 143, "y": 95},
-            {"flags": 4, "matrix": [4, 0], "x": 73, "y": 60},
-            {"flags": 4, "matrix": [4, 1], "x": 109, "y": 60},
-            {"flags": 4, "matrix": [4, 2], "x": 144, "y": 60},
-            {"flags": 4, "matrix": [4, 3], "x": 188, "y": 51},
-            {"flags": 4, "matrix": [5, 0], "x": 91, "y": 25},
-            {"flags": 4, "matrix": [5, 2], "x": 144, "y": 25},
-
-            {"flags": 2, "x": 61, "y": 26},
-            {"flags": 2, "x": 61, "y": 88},
-            {"flags": 2, "x": 61, "y": 158},
-            {"flags": 2, "x": 61, "y": 197},
-            {"flags": 2, "x": 61, "y": 232},
-            {"flags": 2, "x": 192, "y": 232},
-            {"flags": 2, "x": 192, "y": 196},
-            {"flags": 2, "x": 192, "y": 158},
-            {"flags": 2, "x": 192, "y": 87},
-            {"flags": 2, "x": 183, "y": 26},
-            {"flags": 2, "x": 127, "y": 24}
-        ],
-        "sleep": true
-    }
-}
diff --git a/keyboards/atlantis/ps17/keyboard.json b/keyboards/atlantis/ps17/keyboard.json
new file mode 100644
index 00000000000..ee7255c8fa3
--- /dev/null
+++ b/keyboards/atlantis/ps17/keyboard.json
@@ -0,0 +1,111 @@
+{
+    "manufacturer": "Atlantis",
+    "keyboard_name": "PS17",
+    "maintainer": "mjbogusz",
+    "url": "https://qmk.fm/keyboards/",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x414B",
+        "vid": "0x0015"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D3", "D6"],
+        "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D1"}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "animations": {
+            "cycle_all": true,
+            "cycle_pinwheel": true,
+            "rainbow_beacon": true,
+            "pixel_rain": true
+        },
+        "driver": "ws2812",
+        "center_point": [126, 126],
+        "layout": [
+            {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
+            {"flags": 4, "matrix": [1, 1], "x": 108, "y": 165},
+            {"flags": 4, "matrix": [1, 2], "x": 144, "y": 165},
+            {"flags": 4, "matrix": [1, 3], "x": 179, "y": 165},
+            {"flags": 4, "matrix": [2, 0], "x": 74, "y": 129},
+            {"flags": 4, "matrix": [2, 1], "x": 109, "y": 129},
+            {"flags": 4, "matrix": [2, 2], "x": 143, "y": 129},
+            {"flags": 4, "matrix": [2, 3], "x": 188, "y": 121},
+            {"flags": 4, "matrix": [3, 0], "x": 74, "y": 95},
+            {"flags": 4, "matrix": [3, 1], "x": 109, "y": 95},
+            {"flags": 4, "matrix": [3, 2], "x": 143, "y": 95},
+            {"flags": 4, "matrix": [4, 0], "x": 73, "y": 60},
+            {"flags": 4, "matrix": [4, 1], "x": 109, "y": 60},
+            {"flags": 4, "matrix": [4, 2], "x": 144, "y": 60},
+            {"flags": 4, "matrix": [4, 3], "x": 188, "y": 51},
+            {"flags": 4, "matrix": [5, 0], "x": 91, "y": 25},
+            {"flags": 4, "matrix": [5, 2], "x": 144, "y": 25},
+
+            {"flags": 2, "x": 61, "y": 26},
+            {"flags": 2, "x": 61, "y": 88},
+            {"flags": 2, "x": 61, "y": 158},
+            {"flags": 2, "x": 61, "y": 197},
+            {"flags": 2, "x": 61, "y": 232},
+            {"flags": 2, "x": 192, "y": 232},
+            {"flags": 2, "x": 192, "y": 196},
+            {"flags": 2, "x": 192, "y": 158},
+            {"flags": 2, "x": 192, "y": 87},
+            {"flags": 2, "x": 183, "y": 26},
+            {"flags": 2, "x": 127, "y": 24}
+        ],
+        "sleep": true
+    }
+}
diff --git a/keyboards/atlantis/ps17/rules.mk b/keyboards/atlantis/ps17/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/atlantis/ps17/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
deleted file mode 100644
index d0851ac1fde..00000000000
--- a/keyboards/atlas_65/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 Joshua Nguyen
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atlas_65/keyboard.json b/keyboards/atlas_65/keyboard.json
index 896ecf6f20c..4e8db96d3af 100644
--- a/keyboards/atlas_65/keyboard.json
+++ b/keyboards/atlas_65/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
         "rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/atomic/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atomic/keyboard.json b/keyboards/atomic/keyboard.json
index cb4bddceae5..5a269316cfa 100644
--- a/keyboards/atomic/keyboard.json
+++ b/keyboards/atomic/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"],
         "rows": ["D0", "D5", "B5", "B6", "C6"]
diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/info.json
deleted file mode 100644
index 341ed4e8e64..00000000000
--- a/keyboards/atreus/f103/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
-        "rows": ["A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
-}
diff --git a/keyboards/atreus/f103/keyboard.json b/keyboards/atreus/f103/keyboard.json
new file mode 100644
index 00000000000..813ef97e373
--- /dev/null
+++ b/keyboards/atreus/f103/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "matrix_pins": {
+        "cols": ["B10", "B1", "B0", "A7", "A6", "B5", "B4", "B3", "A15", "A10", "A9"],
+        "rows": ["A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true
+    }
+}
diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk
deleted file mode 100644
index 22634018d2f..00000000000
--- a/keyboards/atreus/f103/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-BOOTMAGIC_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json
deleted file mode 100644
index b0d7d554433..00000000000
--- a/keyboards/atreus/feather/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"],
-        "rows": ["B7", "D6", "C7", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/atreus/feather/keyboard.json b/keyboards/atreus/feather/keyboard.json
new file mode 100644
index 00000000000..7f5866e502a
--- /dev/null
+++ b/keyboards/atreus/feather/keyboard.json
@@ -0,0 +1,19 @@
+{
+    "matrix_pins": {
+        "cols": ["D7", "B5", "D1", "D0", "C6", "B6", "F0", "D2", "D3", "F4", "F1"],
+        "rows": ["B7", "D6", "C7", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bluetooth": true,
+        "console": false
+    },
+    "build": {
+        "lto": true
+    },
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
+}
diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk
index c93cad90807..3437a35bdf1 100644
--- a/keyboards/atreus/feather/rules.mk
+++ b/keyboards/atreus/feather/rules.mk
@@ -1,8 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# Build Options
-#   change yes to no to disable
-#
-BLUETOOTH_ENABLE = yes
-CONSOLE_ENABLE = no
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
deleted file mode 100644
index 9b7700e0139..00000000000
--- a/keyboards/atreus62/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atreus62/keyboard.json b/keyboards/atreus62/keyboard.json
index 5263e799df3..c24c02e71e6 100644
--- a/keyboards/atreus62/keyboard.json
+++ b/keyboards/atreus62/keyboard.json
@@ -17,6 +17,12 @@
     "nkro": false,
     "unicode": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"],
     "rows": ["D2", "D3", "D1", "D0", "D4"]
diff --git a/keyboards/atreyu/info.json b/keyboards/atreyu/info.json
new file mode 100644
index 00000000000..26caa20330a
--- /dev/null
+++ b/keyboards/atreyu/info.json
@@ -0,0 +1,8 @@
+{
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    }
+}
diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h
deleted file mode 100644
index d7c434426bc..00000000000
--- a/keyboards/atreyu/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Jesus Climent  (@climent)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atreyu/rev1/keyboard.json b/keyboards/atreyu/rev1/keyboard.json
index 8a38baabf81..dc632a74a7b 100644
--- a/keyboards/atreyu/rev1/keyboard.json
+++ b/keyboards/atreyu/rev1/keyboard.json
@@ -8,6 +8,12 @@
       "pid": "0x0001",
       "device_version": "0.0.1"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C6", "D4", "D0", "D1", "D2", "D3"],
         "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h
deleted file mode 100644
index d7c434426bc..00000000000
--- a/keyboards/atreyu/rev2/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Jesus Climent  (@climent)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atreyu/rev2/keyboard.json b/keyboards/atreyu/rev2/keyboard.json
index 6fcfd64d1ff..19dc8761c49 100644
--- a/keyboards/atreyu/rev2/keyboard.json
+++ b/keyboards/atreyu/rev2/keyboard.json
@@ -8,6 +8,12 @@
       "pid": "0x0001",
       "device_version": "0.0.2"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "C6", "D4", "D2", "D3"],
         "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"]
diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk
index 23ebd8ba330..4daffe6b9d4 100644
--- a/keyboards/atreyu/rules.mk
+++ b/keyboards/atreyu/rules.mk
@@ -1,16 +1 @@
 DEFAULT_FOLDER = atreyu/rev1
-
-# 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
-
-ENCODER_ENABLE = no
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at1/keyboard.json b/keyboards/atset/at1/keyboard.json
index e8fa5f8b5fe..4c4806c40bb 100644
--- a/keyboards/atset/at1/keyboard.json
+++ b/keyboards/atset/at1/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6"],
     "rows": ["D2"]
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at12/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at12/keyboard.json b/keyboards/atset/at12/keyboard.json
index c15ff3f46ea..8c7a3d4ea90 100644
--- a/keyboards/atset/at12/keyboard.json
+++ b/keyboards/atset/at12/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "B5", "B4"],
     "rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at16/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at16/keyboard.json b/keyboards/atset/at16/keyboard.json
index 0db5ad692c7..2c03c2295f7 100644
--- a/keyboards/atset/at16/keyboard.json
+++ b/keyboards/atset/at16/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "B5", "B4", "B2"],
     "rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at3/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at3/keyboard.json b/keyboards/atset/at3/keyboard.json
index 171faf984a0..e6d1d97bf0a 100644
--- a/keyboards/atset/at3/keyboard.json
+++ b/keyboards/atset/at3/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "B5", "B4"],
     "rows": ["D2"]
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at6/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at6/keyboard.json b/keyboards/atset/at6/keyboard.json
index c24611f8b74..8cf2d9e9e01 100644
--- a/keyboards/atset/at6/keyboard.json
+++ b/keyboards/atset/at6/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "B5", "B4"],
     "rows": ["D2", "D1"]
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
deleted file mode 100644
index dc6abdcaf25..00000000000
--- a/keyboards/atset/at9/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/atset/at9/keyboard.json b/keyboards/atset/at9/keyboard.json
index 35bdf95550e..c531397f3aa 100644
--- a/keyboards/atset/at9/keyboard.json
+++ b/keyboards/atset/at9/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "B5", "B4"],
     "rows": ["D2", "D1", "D0"]
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
deleted file mode 100644
index 50001e978cc..00000000000
--- a/keyboards/atxkb/1894/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Ryota Goto
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/atxkb/1894/keyboard.json b/keyboards/atxkb/1894/keyboard.json
index 0ea4918bf38..5abaf88eb0b 100644
--- a/keyboards/atxkb/1894/keyboard.json
+++ b/keyboards/atxkb/1894/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
         "rows": ["B1", "B2", "B3", "F0", "F1"]
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
deleted file mode 100644
index 9311e0f8086..00000000000
--- a/keyboards/aurora65/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Aurora65",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4136",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 36,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
-        "rows": ["B3", "B4", "B5", "A8", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["65_ansi_blocker"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aurora65/keyboard.json b/keyboards/aurora65/keyboard.json
new file mode 100644
index 00000000000..1c0dd684cb2
--- /dev/null
+++ b/keyboards/aurora65/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "Aurora65",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4136",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 36,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["65_ansi_blocker"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/aurora65/rules.mk
+++ b/keyboards/aurora65/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
deleted file mode 100644
index 7787ae2a953..00000000000
--- a/keyboards/avalanche/v1/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "Avalanche",
-    "manufacturer": "vitvlkv",
-    "url": "https://github.com/vlkv/avalanche",
-    "maintainer": "vlkv",
-    "usb": {
-        "vid": "0xCEE2",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.75},
-                {"matrix": [0, 3], "x": 3, "y": 0.25},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.35},
-
-                {"matrix": [5, 6], "x": 10, "y": 0.35},
-                {"matrix": [5, 5], "x": 11, "y": 0.25},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0.25},
-                {"matrix": [5, 2], "x": 14, "y": 0.75},
-                {"matrix": [5, 1], "x": 15, "y": 0.75},
-
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.75},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.35},
-
-                {"matrix": [6, 6], "x": 10, "y": 1.35},
-                {"matrix": [6, 5], "x": 11, "y": 1.25},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1.25},
-                {"matrix": [6, 2], "x": 14, "y": 1.75},
-                {"matrix": [6, 1], "x": 15, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.85},
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [2, 2], "x": 2, "y": 2.75},
-                {"matrix": [2, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.35},
-                {"matrix": [2, 7], "x": 7, "y": 2.6},
-
-                {"matrix": [7, 7], "x": 9, "y": 2.6},
-                {"matrix": [7, 6], "x": 10, "y": 2.35},
-                {"matrix": [7, 5], "x": 11, "y": 2.25},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2.25},
-                {"matrix": [7, 2], "x": 14, "y": 2.75},
-                {"matrix": [7, 1], "x": 15, "y": 2.75},
-                {"matrix": [7, 0], "x": 16, "y": 2.85},
-
-                {"matrix": [3, 1], "x": 1, "y": 3.75},
-                {"matrix": [3, 2], "x": 2, "y": 3.75},
-                {"matrix": [3, 3], "x": 3, "y": 3.25},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6, "y": 3.35},
-                {"matrix": [3, 7], "x": 7, "y": 3.7},
-
-                {"matrix": [8, 7], "x": 9, "y": 3.7},
-                {"matrix": [8, 6], "x": 10, "y": 3.35},
-                {"matrix": [8, 5], "x": 11, "y": 3.25},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3.25},
-                {"matrix": [8, 2], "x": 14, "y": 3.75},
-                {"matrix": [8, 1], "x": 15, "y": 3.75},
-
-                {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25},
-                {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25},
-                {"matrix": [4, 6], "x": 6, "y": 4.45},
-                {"matrix": [4, 7], "x": 7, "y": 4.8},
-
-                {"matrix": [9, 7], "x": 9, "y": 4.8},
-                {"matrix": [9, 6], "x": 10, "y": 4.45},
-                {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25},
-                {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/avalanche/v1/keyboard.json b/keyboards/avalanche/v1/keyboard.json
new file mode 100644
index 00000000000..97acaf0d9f9
--- /dev/null
+++ b/keyboards/avalanche/v1/keyboard.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
+    "url": "https://github.com/vlkv/avalanche",
+    "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.75},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.35},
+
+                {"matrix": [5, 6], "x": 10, "y": 0.35},
+                {"matrix": [5, 5], "x": 11, "y": 0.25},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0.25},
+                {"matrix": [5, 2], "x": 14, "y": 0.75},
+                {"matrix": [5, 1], "x": 15, "y": 0.75},
+
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.75},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.35},
+
+                {"matrix": [6, 6], "x": 10, "y": 1.35},
+                {"matrix": [6, 5], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 2], "x": 14, "y": 1.75},
+                {"matrix": [6, 1], "x": 15, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.85},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.75},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.35},
+                {"matrix": [2, 7], "x": 7, "y": 2.6},
+
+                {"matrix": [7, 7], "x": 9, "y": 2.6},
+                {"matrix": [7, 6], "x": 10, "y": 2.35},
+                {"matrix": [7, 5], "x": 11, "y": 2.25},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2.25},
+                {"matrix": [7, 2], "x": 14, "y": 2.75},
+                {"matrix": [7, 1], "x": 15, "y": 2.75},
+                {"matrix": [7, 0], "x": 16, "y": 2.85},
+
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.75},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 3.35},
+                {"matrix": [3, 7], "x": 7, "y": 3.7},
+
+                {"matrix": [8, 7], "x": 9, "y": 3.7},
+                {"matrix": [8, 6], "x": 10, "y": 3.35},
+                {"matrix": [8, 5], "x": 11, "y": 3.25},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 2], "x": 14, "y": 3.75},
+                {"matrix": [8, 1], "x": 15, "y": 3.75},
+
+                {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6, "y": 4.45},
+                {"matrix": [4, 7], "x": 7, "y": 4.8},
+
+                {"matrix": [9, 7], "x": 9, "y": 4.8},
+                {"matrix": [9, 6], "x": 10, "y": 4.45},
+                {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk
deleted file mode 100644
index ef90e04bc1d..00000000000
--- a/keyboards/avalanche/v1/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
deleted file mode 100644
index 62c284a8454..00000000000
--- a/keyboards/avalanche/v2/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Avalanche",
-    "manufacturer": "vitvlkv",
-    "url": "https://github.com/vlkv/avalanche",
-    "maintainer": "vlkv",
-    "usb": {
-        "vid": "0xCEE2",
-        "pid": "0x0002",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75},
-                {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75},
-                {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25},
-                {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25},
-                {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35},
-
-                {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35},
-                {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25},
-                {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
-                {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25},
-                {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75},
-                {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75},
-
-                {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75},
-                {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75},
-                {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25},
-                {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
-                {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25},
-                {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35},
-
-                {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35},
-                {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25},
-                {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
-                {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25},
-                {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75},
-                {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75},
-
-                {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85},
-                {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75},
-                {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75},
-                {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25},
-                {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25},
-                {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35},
-                {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6},
-
-                {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6},
-                {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35},
-                {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25},
-                {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
-                {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25},
-                {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75},
-                {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75},
-                {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85},
-
-                {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75},
-                {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75},
-                {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
-                {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35},
-                {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7},
-
-                {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7},
-                {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35},
-                {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25},
-                {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
-                {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25},
-                {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75},
-                {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75},
-
-                {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55},
-                {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45},
-                {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4},
-                {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45},
-                {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8},
-
-                {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8},
-                {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45},
-                {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4},
-                {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45},
-                {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55}
-            ]
-        }
-    }
-}
diff --git a/keyboards/avalanche/v2/keyboard.json b/keyboards/avalanche/v2/keyboard.json
new file mode 100644
index 00000000000..219e5bb6c6e
--- /dev/null
+++ b/keyboards/avalanche/v2/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
+    "url": "https://github.com/vlkv/avalanche",
+    "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0002",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75},
+                {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75},
+                {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25},
+                {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25},
+                {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35},
+
+                {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35},
+                {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25},
+                {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
+                {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25},
+                {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75},
+                {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75},
+
+                {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75},
+                {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75},
+                {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25},
+                {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25},
+                {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35},
+
+                {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35},
+                {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25},
+                {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
+                {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25},
+                {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75},
+                {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75},
+
+                {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85},
+                {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75},
+                {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75},
+                {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25},
+                {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25},
+                {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35},
+                {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6},
+
+                {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6},
+                {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35},
+                {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25},
+                {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
+                {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25},
+                {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75},
+                {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75},
+                {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85},
+
+                {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75},
+                {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75},
+                {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35},
+                {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7},
+
+                {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7},
+                {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35},
+                {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25},
+                {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
+                {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25},
+                {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75},
+                {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75},
+
+                {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55},
+                {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45},
+                {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4},
+                {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45},
+                {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8},
+
+                {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8},
+                {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45},
+                {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4},
+                {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45},
+                {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55}
+            ]
+        }
+    }
+}
diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk
deleted file mode 100644
index 8e241b2dfd6..00000000000
--- a/keyboards/avalanche/v2/rules.mk
+++ /dev/null
@@ -1,15 +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
-ENCODER_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
deleted file mode 100644
index 8cf8187df7f..00000000000
--- a/keyboards/avalanche/v3/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Avalanche",
-    "manufacturer": "vitvlkv",
-    "url": "https://github.com/vlkv/avalanche",
-    "maintainer": "vlkv",
-    "usb": {
-        "vid": "0xCEE2",
-        "pid": "0x0003",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [7, 7]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.75},
-                {"matrix": [0, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0.25},
-                {"matrix": [0, 5], "x": 6, "y": 0.35},
-
-                {"matrix": [5, 5], "x": 12, "y": 0.35},
-                {"matrix": [5, 4], "x": 13, "y": 0.25},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 2], "x": 15, "y": 0.25},
-                {"matrix": [5, 1], "x": 16, "y": 0.75},
-                {"matrix": [5, 0], "x": 17, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.75},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.35},
-
-                {"matrix": [6, 5], "x": 12, "y": 1.35},
-                {"matrix": [6, 4], "x": 13, "y": 1.25},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 2], "x": 15, "y": 1.25},
-                {"matrix": [6, 1], "x": 16, "y": 1.75},
-                {"matrix": [6, 0], "x": 17, "y": 1.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.85},
-                {"matrix": [2, 0], "x": 1, "y": 2.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.75},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.35},
-
-                {"matrix": [7, 5], "x": 12, "y": 2.35},
-                {"matrix": [7, 4], "x": 13, "y": 2.25},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 2], "x": 15, "y": 2.25},
-                {"matrix": [7, 1], "x": 16, "y": 2.75},
-                {"matrix": [7, 0], "x": 17, "y": 2.75},
-                {"matrix": [9, 0], "x": 18, "y": 2.85},
-
-                {"matrix": [3, 0], "x": 1, "y": 3.75},
-                {"matrix": [3, 1], "x": 2, "y": 3.75},
-                {"matrix": [3, 2], "x": 3, "y": 3.25},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.35},
-                {"matrix": [3, 6], "x": 7, "y": 3.7},
-                {"matrix": [2, 6], "x": 8, "y": 4.05},
-
-                {"matrix": [7, 6], "x": 10, "y": 4.05},
-                {"matrix": [8, 6], "x": 11, "y": 3.7},
-                {"matrix": [8, 5], "x": 12, "y": 3.35},
-                {"matrix": [8, 4], "x": 13, "y": 3.25},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-                {"matrix": [8, 2], "x": 15, "y": 3.25},
-                {"matrix": [8, 1], "x": 16, "y": 3.75},
-                {"matrix": [8, 0], "x": 17, "y": 3.75},
-
-                {"matrix": [4, 2], "x": 3.4, "y": 4.55},
-                {"matrix": [4, 3], "x": 4.6, "y": 4.45},
-                {"matrix": [4, 4], "x": 5.8, "y": 4.4},
-                {"matrix": [4, 5], "x": 7, "y": 4.7},
-                {"matrix": [4, 6], "x": 8, "y": 5.05},
-
-                {"matrix": [9, 6], "x": 10, "y": 5.05},
-                {"matrix": [9, 5], "x": 11, "y": 4.7},
-                {"matrix": [9, 4], "x": 12.2, "y": 4.4},
-                {"matrix": [9, 3], "x": 13.4, "y": 4.45},
-                {"matrix": [9, 2], "x": 14.6, "y": 4.55}
-            ]
-        }
-    }
-}
diff --git a/keyboards/avalanche/v3/keyboard.json b/keyboards/avalanche/v3/keyboard.json
new file mode 100644
index 00000000000..6104dbd7939
--- /dev/null
+++ b/keyboards/avalanche/v3/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
+    "url": "https://github.com/vlkv/avalanche",
+    "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0003",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [7, 7]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.75},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.35},
+
+                {"matrix": [5, 5], "x": 12, "y": 0.35},
+                {"matrix": [5, 4], "x": 13, "y": 0.25},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 2], "x": 15, "y": 0.25},
+                {"matrix": [5, 1], "x": 16, "y": 0.75},
+                {"matrix": [5, 0], "x": 17, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.75},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.35},
+
+                {"matrix": [6, 5], "x": 12, "y": 1.35},
+                {"matrix": [6, 4], "x": 13, "y": 1.25},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 2], "x": 15, "y": 1.25},
+                {"matrix": [6, 1], "x": 16, "y": 1.75},
+                {"matrix": [6, 0], "x": 17, "y": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.85},
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.75},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.35},
+
+                {"matrix": [7, 5], "x": 12, "y": 2.35},
+                {"matrix": [7, 4], "x": 13, "y": 2.25},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 2], "x": 15, "y": 2.25},
+                {"matrix": [7, 1], "x": 16, "y": 2.75},
+                {"matrix": [7, 0], "x": 17, "y": 2.75},
+                {"matrix": [9, 0], "x": 18, "y": 2.85},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.35},
+                {"matrix": [3, 6], "x": 7, "y": 3.7},
+                {"matrix": [2, 6], "x": 8, "y": 4.05},
+
+                {"matrix": [7, 6], "x": 10, "y": 4.05},
+                {"matrix": [8, 6], "x": 11, "y": 3.7},
+                {"matrix": [8, 5], "x": 12, "y": 3.35},
+                {"matrix": [8, 4], "x": 13, "y": 3.25},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 2], "x": 15, "y": 3.25},
+                {"matrix": [8, 1], "x": 16, "y": 3.75},
+                {"matrix": [8, 0], "x": 17, "y": 3.75},
+
+                {"matrix": [4, 2], "x": 3.4, "y": 4.55},
+                {"matrix": [4, 3], "x": 4.6, "y": 4.45},
+                {"matrix": [4, 4], "x": 5.8, "y": 4.4},
+                {"matrix": [4, 5], "x": 7, "y": 4.7},
+                {"matrix": [4, 6], "x": 8, "y": 5.05},
+
+                {"matrix": [9, 6], "x": 10, "y": 5.05},
+                {"matrix": [9, 5], "x": 11, "y": 4.7},
+                {"matrix": [9, 4], "x": 12.2, "y": 4.4},
+                {"matrix": [9, 3], "x": 13.4, "y": 4.45},
+                {"matrix": [9, 2], "x": 14.6, "y": 4.55}
+            ]
+        }
+    }
+}
diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk
deleted file mode 100644
index 5a35722be4e..00000000000
--- a/keyboards/avalanche/v3/rules.mk
+++ /dev/null
@@ -1,15 +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
-ENCODER_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
deleted file mode 100644
index 7bb047466b5..00000000000
--- a/keyboards/avalanche/v4/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "keyboard_name": "Avalanche",
-    "manufacturer": "vitvlkv",
-    "url": "https://github.com/vlkv/avalanche",
-    "maintainer": "vlkv",
-    "usb": {
-        "vid": "0xCEE2",
-        "pid": "0x0004",
-        "device_version": "0.0.4"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 64,
-        "max_brightness": 100,
-        "led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
-        "split_count": [32, 32],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1, "y": 0.75},
-                {"matrix": [0, 1], "x": 2, "y": 0.75},
-                {"matrix": [0, 2], "x": 3, "y": 0.25},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0.25},
-                {"matrix": [0, 5], "x": 6, "y": 0.35},
-
-                {"matrix": [5, 5], "x": 12, "y": 0.35},
-                {"matrix": [5, 4], "x": 13, "y": 0.25},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 2], "x": 15, "y": 0.25},
-                {"matrix": [5, 1], "x": 16, "y": 0.75},
-                {"matrix": [5, 0], "x": 17, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 1, "y": 1.75},
-                {"matrix": [1, 1], "x": 2, "y": 1.75},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.35},
-
-                {"matrix": [6, 5], "x": 12, "y": 1.35},
-                {"matrix": [6, 4], "x": 13, "y": 1.25},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 2], "x": 15, "y": 1.25},
-                {"matrix": [6, 1], "x": 16, "y": 1.75},
-                {"matrix": [6, 0], "x": 17, "y": 1.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.85},
-                {"matrix": [2, 0], "x": 1, "y": 2.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.75},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.35},
-
-                {"matrix": [7, 5], "x": 12, "y": 2.35},
-                {"matrix": [7, 4], "x": 13, "y": 2.25},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 2], "x": 15, "y": 2.25},
-                {"matrix": [7, 1], "x": 16, "y": 2.75},
-                {"matrix": [7, 0], "x": 17, "y": 2.75},
-                {"matrix": [9, 0], "x": 18, "y": 2.85},
-
-                {"matrix": [3, 0], "x": 1, "y": 3.75},
-                {"matrix": [3, 1], "x": 2, "y": 3.75},
-                {"matrix": [3, 2], "x": 3, "y": 3.25},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.35},
-                {"matrix": [3, 6], "x": 7, "y": 3.7},
-                {"matrix": [2, 6], "x": 8, "y": 4.05},
-
-                {"matrix": [7, 6], "x": 10, "y": 4.05},
-                {"matrix": [8, 6], "x": 11, "y": 3.7},
-                {"matrix": [8, 5], "x": 12, "y": 3.35},
-                {"matrix": [8, 4], "x": 13, "y": 3.25},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-                {"matrix": [8, 2], "x": 15, "y": 3.25},
-                {"matrix": [8, 1], "x": 16, "y": 3.75},
-                {"matrix": [8, 0], "x": 17, "y": 3.75},
-
-                {"matrix": [4, 2], "x": 3.4, "y": 4.55},
-                {"matrix": [4, 3], "x": 4.6, "y": 4.45},
-                {"matrix": [4, 4], "x": 5.8, "y": 4.4},
-                {"matrix": [4, 5], "x": 7, "y": 4.7},
-                {"matrix": [4, 6], "x": 8, "y": 5.05},
-
-                {"matrix": [9, 6], "x": 10, "y": 5.05},
-                {"matrix": [9, 5], "x": 11, "y": 4.7},
-                {"matrix": [9, 4], "x": 12.2, "y": 4.4},
-                {"matrix": [9, 3], "x": 13.4, "y": 4.45},
-                {"matrix": [9, 2], "x": 14.6, "y": 4.55}
-            ]
-        }
-    }
-}
diff --git a/keyboards/avalanche/v4/keyboard.json b/keyboards/avalanche/v4/keyboard.json
new file mode 100644
index 00000000000..2a4909ba368
--- /dev/null
+++ b/keyboards/avalanche/v4/keyboard.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
+    "url": "https://github.com/vlkv/avalanche",
+    "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0004",
+        "device_version": "0.0.4"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "encoder": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 64,
+        "max_brightness": 100,
+        "led_map": [28, 30, 31, 29, 24, 25, 26, 27, 22, 21, 20, 19, 23, 18, 14, 15, 16, 17, 12, 11, 10, 9, 13, 5, 6, 7, 8, 4, 3, 2, 1, 0, 34, 32, 33, 35, 37, 38, 39, 40, 45, 44, 43, 42, 36, 41, 47, 48, 49, 50, 54, 53, 52, 51, 46, 55, 56, 57, 58, 62, 61, 60, 59, 63],
+        "split_count": [32, 32],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1, "y": 0.75},
+                {"matrix": [0, 1], "x": 2, "y": 0.75},
+                {"matrix": [0, 2], "x": 3, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.35},
+
+                {"matrix": [5, 5], "x": 12, "y": 0.35},
+                {"matrix": [5, 4], "x": 13, "y": 0.25},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 2], "x": 15, "y": 0.25},
+                {"matrix": [5, 1], "x": 16, "y": 0.75},
+                {"matrix": [5, 0], "x": 17, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 1, "y": 1.75},
+                {"matrix": [1, 1], "x": 2, "y": 1.75},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.35},
+
+                {"matrix": [6, 5], "x": 12, "y": 1.35},
+                {"matrix": [6, 4], "x": 13, "y": 1.25},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 2], "x": 15, "y": 1.25},
+                {"matrix": [6, 1], "x": 16, "y": 1.75},
+                {"matrix": [6, 0], "x": 17, "y": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.85},
+                {"matrix": [2, 0], "x": 1, "y": 2.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.75},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.35},
+
+                {"matrix": [7, 5], "x": 12, "y": 2.35},
+                {"matrix": [7, 4], "x": 13, "y": 2.25},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 2], "x": 15, "y": 2.25},
+                {"matrix": [7, 1], "x": 16, "y": 2.75},
+                {"matrix": [7, 0], "x": 17, "y": 2.75},
+                {"matrix": [9, 0], "x": 18, "y": 2.85},
+
+                {"matrix": [3, 0], "x": 1, "y": 3.75},
+                {"matrix": [3, 1], "x": 2, "y": 3.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.35},
+                {"matrix": [3, 6], "x": 7, "y": 3.7},
+                {"matrix": [2, 6], "x": 8, "y": 4.05},
+
+                {"matrix": [7, 6], "x": 10, "y": 4.05},
+                {"matrix": [8, 6], "x": 11, "y": 3.7},
+                {"matrix": [8, 5], "x": 12, "y": 3.35},
+                {"matrix": [8, 4], "x": 13, "y": 3.25},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 2], "x": 15, "y": 3.25},
+                {"matrix": [8, 1], "x": 16, "y": 3.75},
+                {"matrix": [8, 0], "x": 17, "y": 3.75},
+
+                {"matrix": [4, 2], "x": 3.4, "y": 4.55},
+                {"matrix": [4, 3], "x": 4.6, "y": 4.45},
+                {"matrix": [4, 4], "x": 5.8, "y": 4.4},
+                {"matrix": [4, 5], "x": 7, "y": 4.7},
+                {"matrix": [4, 6], "x": 8, "y": 5.05},
+
+                {"matrix": [9, 6], "x": 10, "y": 5.05},
+                {"matrix": [9, 5], "x": 11, "y": 4.7},
+                {"matrix": [9, 4], "x": 12.2, "y": 4.4},
+                {"matrix": [9, 3], "x": 13.4, "y": 4.45},
+                {"matrix": [9, 2], "x": 14.6, "y": 4.55}
+            ]
+        }
+    }
+}
diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk
deleted file mode 100644
index 513c25d04d9..00000000000
--- a/keyboards/avalanche/v4/rules.mk
+++ /dev/null
@@ -1,16 +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
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
deleted file mode 100644
index 35ca2e0fc3c..00000000000
--- a/keyboards/aves60/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Evelien Dekkers (@evyd13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/aves60/keyboard.json b/keyboards/aves60/keyboard.json
index fce12cd9f73..6d58d43b6a5 100644
--- a/keyboards/aves60/keyboard.json
+++ b/keyboards/aves60/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["F6", "F7", "F5", "F1", "F4"]
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
deleted file mode 100644
index 95af0f8e733..00000000000
--- a/keyboards/aves65/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 I/O Keyboards <hello@iokeyboards.eu>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/aves65/keyboard.json b/keyboards/aves65/keyboard.json
index fba7dcaf387..3ad686f83a1 100644
--- a/keyboards/aves65/keyboard.json
+++ b/keyboards/aves65/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
         "rows": ["D4", "D6", "D7", "B4", "E6"]
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
deleted file mode 100644
index 14a3c8213e3..00000000000
--- a/keyboards/axolstudio/helpo/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "keyboard_name": "Helpo",
-    "manufacturer": "Axolstudio",
-    "url": "",
-    "maintainer": "kb-elmo",
-    "usb": {
-        "vid": "0x525C",
-        "pid": "0xC89F",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B4", "B3", "B2", "B1"],
-        "rows": ["A2", "A3", "A4", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 4], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [0, 0], "x": 4, "y": 0},
-
-                {"matrix": [1, 4], "x": 0, "y": 1},
-                {"matrix": [1, 3], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 0], "x": 4, "y": 1},
-
-                {"matrix": [2, 4], "x": 0, "y": 2},
-                {"matrix": [2, 3], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 1], "x": 3, "y": 2},
-                {"matrix": [2, 0], "x": 4, "y": 2},
-
-                {"matrix": [3, 4], "x": 0, "y": 3},
-                {"matrix": [3, 3], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 1], "x": 3, "y": 3},
-                {"matrix": [3, 0], "x": 4, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/axolstudio/helpo/keyboard.json b/keyboards/axolstudio/helpo/keyboard.json
new file mode 100644
index 00000000000..c90c967788e
--- /dev/null
+++ b/keyboards/axolstudio/helpo/keyboard.json
@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "Helpo",
+    "manufacturer": "Axolstudio",
+    "url": "",
+    "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x525C",
+        "pid": "0xC89F",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B4", "B3", "B2", "B1"],
+        "rows": ["A2", "A3", "A4", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 4], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4, "y": 0},
+
+                {"matrix": [1, 4], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1},
+
+                {"matrix": [2, 4], "x": 0, "y": 2},
+                {"matrix": [2, 3], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 0], "x": 4, "y": 2},
+
+                {"matrix": [3, 4], "x": 0, "y": 3},
+                {"matrix": [3, 3], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [3, 0], "x": 4, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/axolstudio/helpo/rules.mk
+++ b/keyboards/axolstudio/helpo/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json
deleted file mode 100644
index 6b65aa5521a..00000000000
--- a/keyboards/aya/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "Aya",
-    "manufacturer": "DanNixon",
-    "url": "https://github.com/DanNixon/aya",
-    "maintainer": "dannixon",
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0x2925",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-                {"matrix": [0, 5], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [0, 1], "x": 5, "y": 0},
-                {"matrix": [0, 0], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 3], "x": 15, "y": 0},
-                {"matrix": [5, 4], "x": 16, "y": 0},
-                {"matrix": [5, 5], "x": 17, "y": 0},
-                {"matrix": [5, 6], "x": 18, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 5], "x": 1, "y": 1},
-                {"matrix": [1, 4], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 1], "x": 5, "y": 1},
-                {"matrix": [1, 0], "x": 6, "y": 1},
-                {"matrix": [6, 0], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1},
-                {"matrix": [6, 3], "x": 15, "y": 1},
-                {"matrix": [6, 4], "x": 16, "y": 1},
-                {"matrix": [6, 5], "x": 17, "y": 1},
-                {"matrix": [6, 6], "x": 18, "y": 1},
-
-                {"matrix": [2, 6], "x": 0, "y": 2},
-                {"matrix": [2, 5], "x": 1, "y": 2},
-                {"matrix": [2, 4], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [2, 1], "x": 5, "y": 2},
-                {"matrix": [2, 0], "x": 6, "y": 2},
-                {"matrix": [4, 0], "x": 7, "y": 2},
-                {"matrix": [9, 0], "x": 11, "y": 2},
-                {"matrix": [7, 0], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2},
-                {"matrix": [7, 3], "x": 15, "y": 2},
-                {"matrix": [7, 4], "x": 16, "y": 2},
-                {"matrix": [7, 5], "x": 17, "y": 2},
-                {"matrix": [7, 6], "x": 18, "y": 2},
-
-                {"matrix": [3, 6], "x": 0, "y": 3},
-                {"matrix": [3, 5], "x": 1, "y": 3},
-                {"matrix": [3, 4], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 1], "x": 5, "y": 3},
-                {"matrix": [3, 0], "x": 6, "y": 3},
-                {"matrix": [4, 3], "x": 7, "y": 3},
-                {"matrix": [4, 4], "x": 8, "y": 3},
-                {"matrix": [9, 4], "x": 10, "y": 3},
-                {"matrix": [9, 3], "x": 11, "y": 3},
-                {"matrix": [8, 0], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3},
-                {"matrix": [8, 3], "x": 15, "y": 3},
-                {"matrix": [8, 4], "x": 16, "y": 3},
-                {"matrix": [8, 5], "x": 17, "y": 3},
-                {"matrix": [8, 6], "x": 18, "y": 3},
-
-                {"matrix": [4, 2], "x": 5, "y": 4},
-                {"matrix": [4, 1], "x": 6, "y": 4},
-                {"matrix": [4, 5], "x": 7, "y": 4},
-                {"matrix": [4, 6], "x": 8, "y": 4},
-                {"matrix": [9, 6], "x": 10, "y": 4},
-                {"matrix": [9, 5], "x": 11, "y": 4},
-                {"matrix": [9, 1], "x": 12, "y": 4},
-                {"matrix": [9, 2], "x": 13, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/aya/keyboard.json b/keyboards/aya/keyboard.json
new file mode 100644
index 00000000000..547f495ddd2
--- /dev/null
+++ b/keyboards/aya/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Aya",
+    "manufacturer": "DanNixon",
+    "url": "https://github.com/DanNixon/aya",
+    "maintainer": "dannixon",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x2925",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
+    "split": {
+        "enabled": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+                {"matrix": [0, 5], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 1], "x": 5, "y": 0},
+                {"matrix": [0, 0], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 4], "x": 16, "y": 0},
+                {"matrix": [5, 5], "x": 17, "y": 0},
+                {"matrix": [5, 6], "x": 18, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 5], "x": 1, "y": 1},
+                {"matrix": [1, 4], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 1], "x": 5, "y": 1},
+                {"matrix": [1, 0], "x": 6, "y": 1},
+                {"matrix": [6, 0], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 3], "x": 15, "y": 1},
+                {"matrix": [6, 4], "x": 16, "y": 1},
+                {"matrix": [6, 5], "x": 17, "y": 1},
+                {"matrix": [6, 6], "x": 18, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 5], "x": 1, "y": 2},
+                {"matrix": [2, 4], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 1], "x": 5, "y": 2},
+                {"matrix": [2, 0], "x": 6, "y": 2},
+                {"matrix": [4, 0], "x": 7, "y": 2},
+                {"matrix": [9, 0], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 3], "x": 15, "y": 2},
+                {"matrix": [7, 4], "x": 16, "y": 2},
+                {"matrix": [7, 5], "x": 17, "y": 2},
+                {"matrix": [7, 6], "x": 18, "y": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3},
+                {"matrix": [3, 5], "x": 1, "y": 3},
+                {"matrix": [3, 4], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 1], "x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [9, 4], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 3], "x": 15, "y": 3},
+                {"matrix": [8, 4], "x": 16, "y": 3},
+                {"matrix": [8, 5], "x": 17, "y": 3},
+                {"matrix": [8, 6], "x": 18, "y": 3},
+
+                {"matrix": [4, 2], "x": 5, "y": 4},
+                {"matrix": [4, 1], "x": 6, "y": 4},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 6], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4},
+                {"matrix": [9, 1], "x": 12, "y": 4},
+                {"matrix": [9, 2], "x": 13, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aya/rules.mk b/keyboards/aya/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/aya/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
deleted file mode 100644
index 0c56f57b207..00000000000
--- a/keyboards/bacca70/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2022 keebnewb
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
diff --git a/keyboards/bacca70/keyboard.json b/keyboards/bacca70/keyboard.json
index c192fb0eb23..8d4483bc6fa 100644
--- a/keyboards/bacca70/keyboard.json
+++ b/keyboards/bacca70/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
         "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
deleted file mode 100644
index 3005d1bcfbb..00000000000
--- a/keyboards/baguette/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/baguette/keyboard.json b/keyboards/baguette/keyboard.json
index f6797dd9390..001757f8618 100644
--- a/keyboards/baguette/keyboard.json
+++ b/keyboards/baguette/keyboard.json
@@ -17,6 +17,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"],
     "rows": ["B3", "B2", "B1", "E6", "D6"]
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json
deleted file mode 100755
index d8834ec0662..00000000000
--- a/keyboards/baion_808/info.json
+++ /dev/null
@@ -1,972 +0,0 @@
-{
-    "keyboard_name": "Baion 808",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4238",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
-        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "scroll_lock": "B7",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5},
-                {"matrix": [2, 13], "x": 14, "y": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
-                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/baion_808/keyboard.json b/keyboards/baion_808/keyboard.json
new file mode 100755
index 00000000000..c770a65e257
--- /dev/null
+++ b/keyboards/baion_808/keyboard.json
@@ -0,0 +1,979 @@
+{
+    "keyboard_name": "Baion 808",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4238",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [2, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/baion_808/rules.mk b/keyboards/baion_808/rules.mk
index 11c4a00e5a5..0ab54aaaf71 100644
--- a/keyboards/baion_808/rules.mk
+++ b/keyboards/baion_808/rules.mk
@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = tkl_ansi tkl_ansi_tsangan tkl_ansi_split_bs_rshift tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 72d296bca4b..455588fb084 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
deleted file mode 100644
index bf090bb7d63..00000000000
--- a/keyboards/bajjak/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "keyboard_name": "BAJJAK",
-    "manufacturer": "garykong",
-    "maintainer": "garykong",
-    "debounce": 30,
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "halfkay",
-    "tapping": {
-        "toggle": 1
-    },
-    "build": {
-        "debounce_type": "sym_eager_pr"
-    },
-    "layouts": {
-        "LAYOUT_6x7": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [10, 0], "x": 12.5, "y": 0},
-                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [6, 1], "x": 6.5, "y": 1.25},
-
-                {"matrix": [7, 1], "x": 9.5, "y": 1.25},
-                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [10, 1], "x": 12.5, "y": 1},
-                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [6, 2], "x": 6.5, "y": 2.25},
-
-                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
-                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [10, 2], "x": 12.5, "y": 2},
-                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 3.25},
-
-                {"matrix": [7, 3], "x": 9.5, "y": 3.25},
-                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [10, 3], "x": 12.5, "y": 3},
-                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
-                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [3, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-                {"matrix": [5, 4], "x": 5.5, "y": 4.25},
-
-                {"matrix": [8, 4], "x": 10.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 4], "x": 12.5, "y": 4},
-                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
-
-                {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
-                {"matrix": [1, 5], "x": 1.5, "y": 5.375},
-                {"matrix": [2, 5], "x": 2.5, "y": 5.125},
-                {"matrix": [3, 5], "x": 3.5, "y": 5},
-                {"matrix": [4, 5], "x": 4.5, "y": 5.125},
-
-                {"matrix": [9, 5], "x": 11.5, "y": 5.125},
-                {"matrix": [10, 5], "x": 12.5, "y": 5},
-                {"matrix": [11, 5], "x": 13.5, "y": 5.125},
-                {"matrix": [12, 5], "x": 14.5, "y": 5.375},
-                {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
-
-                {"matrix": [5, 6], "x": 6, "y": 6},
-                {"matrix": [6, 6], "x": 7, "y": 6},
-
-                {"matrix": [7, 6], "x": 9, "y": 6},
-                {"matrix": [8, 6], "x": 10, "y": 6},
-
-                {"matrix": [4, 6], "x": 7, "y": 7},
-
-                {"matrix": [9, 6], "x": 9, "y": 7},
-
-                {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
-                {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
-                {"matrix": [1, 6], "x": 7, "y": 8},
-
-                {"matrix": [12, 6], "x": 9, "y": 8},
-                {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
-                {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bajjak/keyboard.json b/keyboards/bajjak/keyboard.json
new file mode 100644
index 00000000000..a4ab7298ee1
--- /dev/null
+++ b/keyboards/bajjak/keyboard.json
@@ -0,0 +1,147 @@
+{
+    "keyboard_name": "BAJJAK",
+    "manufacturer": "garykong",
+    "maintainer": "garykong",
+    "debounce": 30,
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "unicode": true,
+        "swap_hands": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "halfkay",
+    "tapping": {
+        "toggle": 1
+    },
+    "build": {
+        "debounce_type": "sym_eager_pr"
+    },
+    "layouts": {
+        "LAYOUT_6x7": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [5, 4], "x": 5.5, "y": 4.25},
+
+                {"matrix": [8, 4], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
+                {"matrix": [1, 5], "x": 1.5, "y": 5.375},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.125},
+                {"matrix": [3, 5], "x": 3.5, "y": 5},
+                {"matrix": [4, 5], "x": 4.5, "y": 5.125},
+
+                {"matrix": [9, 5], "x": 11.5, "y": 5.125},
+                {"matrix": [10, 5], "x": 12.5, "y": 5},
+                {"matrix": [11, 5], "x": 13.5, "y": 5.125},
+                {"matrix": [12, 5], "x": 14.5, "y": 5.375},
+                {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
+
+                {"matrix": [5, 6], "x": 6, "y": 6},
+                {"matrix": [6, 6], "x": 7, "y": 6},
+
+                {"matrix": [7, 6], "x": 9, "y": 6},
+                {"matrix": [8, 6], "x": 10, "y": 6},
+
+                {"matrix": [4, 6], "x": 7, "y": 7},
+
+                {"matrix": [9, 6], "x": 9, "y": 7},
+
+                {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
+                {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
+                {"matrix": [1, 6], "x": 7, "y": 8},
+
+                {"matrix": [12, 6], "x": 9, "y": 8},
+                {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
+                {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
index 21db4112e06..08caba6edc1 100644
--- a/keyboards/bajjak/rules.mk
+++ b/keyboards/bajjak/rules.mk
@@ -3,22 +3,7 @@
 # details), include the following define:
 OPT_DEFS += -DLEFT_LEDS
 
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite        # Custom matrix file for the BAJJAK
-UNICODE_ENABLE = yes        # Unicode
-SWAP_HANDS_ENABLE = yes     # Allow swapping hands of keyboard
 
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
deleted file mode 100644
index deea0f3e5ef..00000000000
--- a/keyboards/bandominedoni/info.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "keyboard_name": "bandominedoni",
-    "manufacturer": "3araht",
-    "url": "https://github.com/3araht",
-    "maintainer": "3araht",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xF4B5",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 50,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
-        "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F5", "pin_b": "F4"}
-                ]
-            }
-        }
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5},
-                {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5},
-                {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5},
-                {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5},
-                {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5},
-
-                {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5},
-                {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5},
-                {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5},
-                {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5},
-                {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5},
-                {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5},
-                {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-
-                {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5},
-                {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5},
-                {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5},
-                {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5},
-                {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5},
-                {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5},
-                {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5},
-
-                {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5},
-                {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5},
-                {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5},
-                {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5},
-                {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5},
-                {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5},
-                {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5},
-
-                {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5},
-                {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5},
-                {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5},
-                {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5},
-                {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5},
-                {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5},
-                {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5},
-                {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5},
-
-                {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0},
-                {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0},
-                {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0},
-                {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0},
-                {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0},
-                {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0},
-
-                {"label": "r10", "matrix": [6, 4], "x": 11, "y": 1},
-                {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1},
-                {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1},
-                {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1},
-                {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1},
-
-                {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2},
-                {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2},
-                {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2},
-                {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2},
-                {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2},
-                {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2},
-
-                {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3},
-                {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3},
-                {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3},
-                {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3},
-                {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3},
-                {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3},
-                {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3},
-                {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3},
-
-                {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4},
-                {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4},
-                {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4},
-                {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4},
-                {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4},
-                {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4},
-                {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4},
-                {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4},
-
-                {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5},
-                {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5},
-                {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5},
-                {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5},
-                {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5},
-                {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5},
-                {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5},
-                {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5},
-                {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bandominedoni/keyboard.json b/keyboards/bandominedoni/keyboard.json
new file mode 100644
index 00000000000..c253da0c839
--- /dev/null
+++ b/keyboards/bandominedoni/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "bandominedoni",
+    "manufacturer": "3araht",
+    "url": "https://github.com/3araht",
+    "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B5",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "midi": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 50,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
+        "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F5", "pin_b": "F4"}
+                ]
+            }
+        }
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5},
+                {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5},
+                {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5},
+                {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5},
+                {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5},
+
+                {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5},
+                {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+
+                {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5},
+                {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5},
+                {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5},
+                {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5},
+                {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5},
+                {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5},
+                {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5},
+
+                {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5},
+                {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5},
+                {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5},
+                {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5},
+                {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5},
+                {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5},
+
+                {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5},
+                {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5},
+                {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5},
+                {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5},
+                {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5},
+                {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5},
+                {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5},
+                {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0},
+                {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0},
+                {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0},
+                {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0},
+                {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0},
+                {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0},
+
+                {"label": "r10", "matrix": [6, 4], "x": 11, "y": 1},
+                {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1},
+                {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1},
+                {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1},
+                {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1},
+
+                {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2},
+                {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2},
+                {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2},
+                {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2},
+                {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2},
+                {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2},
+
+                {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3},
+                {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3},
+                {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3},
+                {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3},
+                {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3},
+                {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3},
+                {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3},
+                {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3},
+
+                {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4},
+                {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4},
+                {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4},
+                {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4},
+                {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4},
+                {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4},
+                {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4},
+                {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4},
+
+                {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5},
+                {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5},
+                {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5},
+                {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5},
+                {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5},
+                {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5},
+                {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5},
+                {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5},
+                {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk
deleted file mode 100644
index c32d761f102..00000000000
--- a/keyboards/bandominedoni/rules.mk
+++ /dev/null
@@ -1,18 +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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-MIDI_ENABLE = yes           # MIDI support
-ENCODER_ENABLE = yes        # encoder on mute button
-SPLIT_KEYBOARD = yes        # Enables split keyboard support
-RGB_MATRIX_ENABLE = no      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/bantam44/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bantam44/keyboard.json b/keyboards/bantam44/keyboard.json
index 2a884c2524e..ac534af6a99 100644
--- a/keyboards/bantam44/keyboard.json
+++ b/keyboards/bantam44/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"],
     "rows": ["F0", "D6", "D4", "D5"]
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 06c67798c01..e64c243aad3 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
deleted file mode 100644
index b4aef08b62d..00000000000
--- a/keyboards/barleycorn_smd/info.json
+++ /dev/null
@@ -1,334 +0,0 @@
-{
-    "keyboard_name": "Barleycorn SMD",
-    "manufacturer": "P3D Store",
-    "maintainer": "matthewdias",
-    "usb": {
-        "vid": "0x7033",
-        "pid": "0x4749",
-        "device_version": "0.0.1",
-        "max_power": 400
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "num_lock": "B3"
-    },
-    "rgblight": {
-        "led_count": 15,
-        "led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5],
-        "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": "E6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.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},
-                {"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.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "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": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-                {"matrix": [2, 17], "x": 18.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},
-                {"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.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4},
-                {"matrix": [4, 17], "x": 18.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/barleycorn_smd/keyboard.json b/keyboards/barleycorn_smd/keyboard.json
new file mode 100644
index 00000000000..cc269296d73
--- /dev/null
+++ b/keyboards/barleycorn_smd/keyboard.json
@@ -0,0 +1,346 @@
+{
+    "keyboard_name": "Barleycorn SMD",
+    "manufacturer": "P3D Store",
+    "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x7033",
+        "pid": "0x4749",
+        "device_version": "0.0.1",
+        "max_power": 400
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B3"
+    },
+    "rgblight": {
+        "led_count": 15,
+        "led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5],
+        "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": "E6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.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},
+                {"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.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "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": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+                {"matrix": [2, 17], "x": 18.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},
+                {"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.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4},
+                {"matrix": [4, 17], "x": 18.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/barleycorn_smd/matrix.c b/keyboards/barleycorn_smd/matrix.c
index 315093c8a98..d8880364b66 100644
--- a/keyboards/barleycorn_smd/matrix.c
+++ b/keyboards/barleycorn_smd/matrix.c
@@ -14,10 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include "wait.h"
-#include "quantum.h"
 #include "i2c_master.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/barleycorn_smd/rules.mk b/keyboards/barleycorn_smd/rules.mk
index 69ecebae2ae..c04c3c92ed3 100644
--- a/keyboards/barleycorn_smd/rules.mk
+++ b/keyboards/barleycorn_smd/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
deleted file mode 100644
index 5dd1c8d063a..00000000000
--- a/keyboards/barracuda/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/barracuda/keyboard.json b/keyboards/barracuda/keyboard.json
index 56cf8f08bb3..6e606e11ea9 100644
--- a/keyboards/barracuda/keyboard.json
+++ b/keyboards/barracuda/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
         "rows": ["C4", "C5", "C6", "D1", "D2", "D3"]
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index c1008da9b86..aecd34737d4 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define EE_HANDS
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
deleted file mode 100644
index 6b97d0c9ec9..00000000000
--- a/keyboards/basekeys/slice/rev1/info.json
+++ /dev/null
@@ -1,377 +0,0 @@
-{
-    "keyboard_name": "Slice",
-    "manufacturer": "2Moons",
-    "url": "https://www.basekeys.com",
-    "maintainer": "2Moons",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEC17",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 8], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        },
-        "LAYOUT_split_backspace": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 6], "x": 15.32, "y": 0},
-                {"matrix": [5, 8], "x": 16.32, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 8], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        },
-        "LAYOUT_split_left_space": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 8], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
-                {"matrix": [4, 6], "x": 7.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 6], "x": 15.32, "y": 0},
-                {"matrix": [5, 7], "x": 16.32, "y": 0},
-                {"matrix": [5, 8], "x": 17.32, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3},
-                {"matrix": [8, 7], "x": 15.97, "y": 3},
-                {"matrix": [8, 8], "x": 16.97, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 4], "x": 5.75, "y": 4},
-                {"matrix": [4, 5], "x": 6.75, "y": 4},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/basekeys/slice/rev1/keyboard.json b/keyboards/basekeys/slice/rev1/keyboard.json
new file mode 100644
index 00000000000..c341597ee66
--- /dev/null
+++ b/keyboards/basekeys/slice/rev1/keyboard.json
@@ -0,0 +1,389 @@
+{
+    "keyboard_name": "Slice",
+    "manufacturer": "2Moons",
+    "url": "https://www.basekeys.com",
+    "maintainer": "2Moons",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEC17",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        },
+        "LAYOUT_split_backspace": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0},
+                {"matrix": [5, 8], "x": 16.32, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        },
+        "LAYOUT_split_left_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0},
+                {"matrix": [5, 7], "x": 16.32, "y": 0},
+                {"matrix": [5, 8], "x": 17.32, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3},
+                {"matrix": [8, 7], "x": 15.97, "y": 3},
+                {"matrix": [8, 8], "x": 16.97, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4},
+                {"matrix": [4, 5], "x": 6.75, "y": 4},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk
deleted file mode 100644
index 992af66fa22..00000000000
--- a/keyboards/basekeys/slice/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 8a0c1946c16..2594d39f2a4 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -21,9 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
deleted file mode 100644
index faec5a99533..00000000000
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-    "keyboard_name": "Slice RGB",
-    "manufacturer": "2Moons",
-    "url": "https://www.basekeys.com",
-    "maintainer": "2Moons",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEC15",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 69,
-        "max_brightness": 120,
-        "split_count": [34, 35],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        },
-        "LAYOUT_split_left_space": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
-                {"matrix": [4, 6], "x": 7.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.66, "y": 0},
-                {"matrix": [0, 2], "x": 2.66, "y": 0},
-                {"matrix": [0, 3], "x": 3.66, "y": 0},
-                {"matrix": [0, 4], "x": 4.66, "y": 0},
-                {"matrix": [0, 5], "x": 5.66, "y": 0},
-                {"matrix": [0, 6], "x": 6.66, "y": 0},
-                {"matrix": [0, 7], "x": 7.66, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.32, "y": 0},
-                {"matrix": [5, 1], "x": 10.32, "y": 0},
-                {"matrix": [5, 2], "x": 11.32, "y": 0},
-                {"matrix": [5, 3], "x": 12.32, "y": 0},
-                {"matrix": [5, 4], "x": 13.32, "y": 0},
-                {"matrix": [5, 5], "x": 14.32, "y": 0},
-                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3.03, "y": 1},
-                {"matrix": [1, 3], "x": 4.03, "y": 1},
-                {"matrix": [1, 4], "x": 5.03, "y": 1},
-                {"matrix": [1, 5], "x": 6.03, "y": 1},
-                {"matrix": [1, 6], "x": 7.03, "y": 1},
-
-                {"matrix": [6, 0], "x": 9, "y": 1},
-                {"matrix": [6, 1], "x": 10, "y": 1},
-                {"matrix": [6, 2], "x": 11, "y": 1},
-                {"matrix": [6, 3], "x": 12, "y": 1},
-                {"matrix": [6, 4], "x": 13, "y": 1},
-                {"matrix": [6, 5], "x": 14, "y": 1},
-                {"matrix": [6, 6], "x": 15.05, "y": 1},
-                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.14, "y": 2},
-                {"matrix": [2, 3], "x": 4.14, "y": 2},
-                {"matrix": [2, 4], "x": 5.14, "y": 2},
-                {"matrix": [2, 5], "x": 6.14, "y": 2},
-                {"matrix": [2, 6], "x": 7.14, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.34, "y": 2},
-                {"matrix": [7, 1], "x": 10.34, "y": 2},
-                {"matrix": [7, 2], "x": 11.34, "y": 2},
-                {"matrix": [7, 3], "x": 12.34, "y": 2},
-                {"matrix": [7, 4], "x": 13.34, "y": 2},
-                {"matrix": [7, 5], "x": 14.34, "y": 2},
-                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.97, "y": 3},
-                {"matrix": [8, 1], "x": 9.97, "y": 3},
-                {"matrix": [8, 2], "x": 10.97, "y": 3},
-                {"matrix": [8, 3], "x": 11.97, "y": 3},
-                {"matrix": [8, 4], "x": 12.97, "y": 3},
-                {"matrix": [8, 5], "x": 13.97, "y": 3},
-                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
-                {"matrix": [8, 7], "x": 16.72, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
-                {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
-                {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
-
-                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
-                {"matrix": [9, 1], "x": 11.22, "y": 4},
-                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 16.48, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/basekeys/slice/rev1_rgb/keyboard.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
new file mode 100644
index 00000000000..a666f266617
--- /dev/null
+++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
@@ -0,0 +1,325 @@
+{
+    "keyboard_name": "Slice RGB",
+    "manufacturer": "2Moons",
+    "url": "https://www.basekeys.com",
+    "maintainer": "2Moons",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEC15",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "rgblight": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 69,
+        "max_brightness": 120,
+        "split_count": [34, 35],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        },
+        "LAYOUT_split_left_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.66, "y": 0},
+                {"matrix": [0, 2], "x": 2.66, "y": 0},
+                {"matrix": [0, 3], "x": 3.66, "y": 0},
+                {"matrix": [0, 4], "x": 4.66, "y": 0},
+                {"matrix": [0, 5], "x": 5.66, "y": 0},
+                {"matrix": [0, 6], "x": 6.66, "y": 0},
+                {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.32, "y": 0},
+                {"matrix": [5, 1], "x": 10.32, "y": 0},
+                {"matrix": [5, 2], "x": 11.32, "y": 0},
+                {"matrix": [5, 3], "x": 12.32, "y": 0},
+                {"matrix": [5, 4], "x": 13.32, "y": 0},
+                {"matrix": [5, 5], "x": 14.32, "y": 0},
+                {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.03, "y": 1},
+                {"matrix": [1, 3], "x": 4.03, "y": 1},
+                {"matrix": [1, 4], "x": 5.03, "y": 1},
+                {"matrix": [1, 5], "x": 6.03, "y": 1},
+                {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15.05, "y": 1},
+                {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.14, "y": 2},
+                {"matrix": [2, 3], "x": 4.14, "y": 2},
+                {"matrix": [2, 4], "x": 5.14, "y": 2},
+                {"matrix": [2, 5], "x": 6.14, "y": 2},
+                {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.34, "y": 2},
+                {"matrix": [7, 1], "x": 10.34, "y": 2},
+                {"matrix": [7, 2], "x": 11.34, "y": 2},
+                {"matrix": [7, 3], "x": 12.34, "y": 2},
+                {"matrix": [7, 4], "x": 13.34, "y": 2},
+                {"matrix": [7, 5], "x": 14.34, "y": 2},
+                {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.97, "y": 3},
+                {"matrix": [8, 1], "x": 9.97, "y": 3},
+                {"matrix": [8, 2], "x": 10.97, "y": 3},
+                {"matrix": [8, 3], "x": 11.97, "y": 3},
+                {"matrix": [8, 4], "x": 12.97, "y": 3},
+                {"matrix": [8, 5], "x": 13.97, "y": 3},
+                {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
+                {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
+                {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
+
+                {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+                {"matrix": [9, 1], "x": 11.22, "y": 4},
+                {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 16.48, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
deleted file mode 100644
index 1e24ec177f9..00000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
deleted file mode 100644
index 584a6e4bfc5..00000000000
--- a/keyboards/basekeys/trifecta/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basekeys/trifecta/keyboard.json b/keyboards/basekeys/trifecta/keyboard.json
index 8777b1ffa9d..8660156f64c 100644
--- a/keyboards/basekeys/trifecta/keyboard.json
+++ b/keyboards/basekeys/trifecta/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
         "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
@@ -54,6 +60,7 @@
         }
     },
     "rgb_matrix": {
+        "driver": "ws2812",
         "sat_steps": 8,
         "val_steps": 8,
         "speed_steps": 10,
@@ -102,7 +109,89 @@
             "multisplash": true,
             "solid_splash": true,
             "solid_multisplash": true
-        }
+        },
+        "layout": [
+            {"x": 218, "y": 7, "flags": 2},
+            {"x": 214, "y": 45, "flags": 2},
+            {"x": 180, "y": 47, "flags": 2},
+            {"x": 147, "y": 50, "flags": 2},
+            {"x": 94, "y": 62, "flags": 2},
+            {"x": 37, "y": 51, "flags": 2},
+            {"x": 4, "y": 8, "flags": 2},
+            {"x": 36, "y": 15, "flags": 2},
+            {"x": 62, "y": 18, "flags": 2},
+            {"x": 78, "y": 5, "flags": 2},
+            {"x": 119, "y": 7, "flags": 2},
+            {"x": 145, "y": 16, "flags": 2},
+            {"x": 166, "y": 3, "flags": 2},
+            {"x": 200, "y": 16, "flags": 2},
+            {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4},
+            {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4},
+            {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4},
+            {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4},
+            {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4},
+            {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4},
+            {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4},
+            {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4},
+            {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4},
+            {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4},
+            {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4},
+            {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4},
+            {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4},
+            {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4},
+            {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4},
+            {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4},
+            {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4},
+            {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4},
+            {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4},
+            {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4},
+            {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4},
+            {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4},
+            {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4},
+            {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4},
+            {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4},
+            {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4},
+            {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4},
+            {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4},
+            {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4},
+            {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4},
+            {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4},
+            {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4},
+            {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4},
+            {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4},
+            {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4},
+            {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4},
+            {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4},
+            {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4},
+            {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4},
+            {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4},
+            {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4},
+            {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4},
+            {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4},
+            {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4},
+            {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4},
+            {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4},
+            {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4},
+            {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4},
+            {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4},
+            {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4},
+            {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4},
+            {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4},
+            {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4},
+            {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4},
+            {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4},
+            {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4},
+            {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4},
+            {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4},
+            {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4},
+            {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4},
+            {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4},
+            {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4},
+            {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4}
+        ]
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c
deleted file mode 100644
index 926180d9966..00000000000
--- a/keyboards/basekeys/trifecta/trifecta.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-led_config_t g_led_config = { {
-    { NO_LED, 70,     61,     52,     43, 34,     24,     14  },
-    {     79, 69,     60,     51,     42, 33,     23, NO_LED  },
-    { NO_LED, 71,     62,     53,     44, 35,     25,     15  },
-    {     78, 68,     59,     50,     41, 32,     22, NO_LED  },
-    {     77, 67,     58,     49,     40, 31, NO_LED,     16  },
-    { NO_LED, 72,     63,     54,     45, 36,     26, NO_LED  },
-    { NO_LED, 73,     64,     55,     46, 37,     27,     17  },
-    {     76, 66,     57,     48,     39, 30,     21, NO_LED  },
-    { NO_LED, 74,     56, NO_LED, NO_LED, 38,     28,     18  },
-    {     75, 65, NO_LED, NO_LED,     47, 29,     20,     19  }
-}, {
-	// Underglow
-    {  218,   7 },  { 214,  45 }, { 180,  47 }, {  147, 50 }, {  94,  62 }, {  37,  51 }, {   4,   8 }, {   36,  15 },
-    {  62,   18 },  {  78,   5 }, { 119,   7 }, {  145, 16 }, { 166,   3 }, { 200,  16 }, 
-    
-    //Per Key
-    { 185,  11 },  { 191,  22 }, { 188,  33 }, { 200,  46 }, { 200,  57 }, { 212,  57 }, { 188,  57 }, { 181,  44 },
-    { 176,  22 },  { 168,  11 }, { 155,  11 }, { 164,  22 }, { 169,  32 }, { 165,  44 }, { 172,  55 }, { 157,  54 }, 
-    { 153,  44 },  { 156,  33 }, { 153,  22 }, { 142,  12 }, { 130,  13 }, { 138,  23 }, { 143,  33 }, { 140,  45 }, 
-    { 137,  56 },  { 128,  47 }, { 132,  35 }, { 127,  25 }, { 119,  16 }, { 107,  17 }, { 115,  27 }, { 120,  37 }, 
-    { 116,  48 },  { 117,  59 }, { 104,  51 }, { 109,  39 }, { 104,  29 }, {  86,  19 }, {  74,  16 }, {  78,  28 }, 
-    {  79,  39 },  {  82,  50 }, {  73,  60 }, {  71,  48 }, {  67,  37 }, {  66,  26 }, {  63,  15 }, {  50,  12 }, 
-    {  55,  24 },  {  55,  35 }, {  59,  47 }, {  50,  56 }, {  47,  45 }, {  43,  33 }, {  43,  22 }, {  39,  10 }, 
-    {  25,  11 },  {  29,  22 }, {  30,  33 }, {  34,  44 }, {  24,  54 }, {   9,  55 }, {  15,  44 }, {  14,  33 }, 
-    {  14,  22 },  {  14,  11 }
-}, {
-    2, 2, 2, 2, 2, 2, 2, 2, 
-    2, 2, 2, 2, 2, 2, 
-
-    4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 
-    4, 4
-} };
-#endif
\ No newline at end of file
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
deleted file mode 100644
index ebf85963191..00000000000
--- a/keyboards/basketweave/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
deleted file mode 100644
index 705ef675ba8..00000000000
--- a/keyboards/basketweave/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Basketweave",
-    "manufacturer": "Clackery",
-    "url": "https://github.com/null-ll/basketweave",
-    "maintainer": "null-ll",
-    "usb": {
-        "vid": "0x6B62",
-        "pid": "0x8989",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "matrix_pins": {
-        "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
-        "rows": ["A6", "C6", "C7", "A7", "A5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D7", "pin_b": "C0"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_default": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 10.5, "y": 0},
-                {"matrix": [0, 9], "x": 11.5, "y": 0},
-                {"matrix": [0, 10], "x": 12.5, "y": 0},
-                {"matrix": [0, 11], "x": 13.5, "y": 0},
-                {"matrix": [0, 12], "x": 14.5, "y": 0},
-                {"matrix": [0, 13], "x": 15.5, "y": 0},
-                {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 10, "y": 1},
-                {"matrix": [1, 8], "x": 11, "y": 1},
-                {"matrix": [1, 9], "x": 12, "y": 1},
-                {"matrix": [1, 10], "x": 13, "y": 1},
-                {"matrix": [1, 11], "x": 14, "y": 1},
-                {"matrix": [1, 12], "x": 15, "y": 1},
-                {"matrix": [1, 13], "x": 16, "y": 1},
-                {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 14], "x": 19, "y": 0.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 10.25, "y": 2},
-                {"matrix": [2, 8], "x": 11.25, "y": 2},
-                {"matrix": [2, 9], "x": 12.25, "y": 2},
-                {"matrix": [2, 10], "x": 13.25, "y": 2},
-                {"matrix": [2, 11], "x": 14.25, "y": 2},
-                {"matrix": [2, 12], "x": 15.25, "y": 2},
-                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-                {"matrix": [3, 7], "x": 9.75, "y": 3},
-                {"matrix": [3, 8], "x": 10.75, "y": 3},
-                {"matrix": [3, 9], "x": 11.75, "y": 3},
-                {"matrix": [3, 10], "x": 12.75, "y": 3},
-                {"matrix": [3, 11], "x": 13.75, "y": 3},
-                {"matrix": [3, 12], "x": 14.75, "y": 3},
-                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [2, 14], "x": 17.75, "y": 3.25},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 8, "y": 4},
-                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 16.75, "y": 4.25},
-                {"matrix": [4, 13], "x": 17.75, "y": 4.25},
-                {"matrix": [3, 14], "x": 18.75, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/basketweave/keyboard.json b/keyboards/basketweave/keyboard.json
new file mode 100644
index 00000000000..75a720b7dd8
--- /dev/null
+++ b/keyboards/basketweave/keyboard.json
@@ -0,0 +1,122 @@
+{
+    "keyboard_name": "Basketweave",
+    "manufacturer": "Clackery",
+    "url": "https://github.com/null-ll/basketweave",
+    "maintainer": "null-ll",
+    "usb": {
+        "vid": "0x6B62",
+        "pid": "0x8989",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
+        "rows": ["A6", "C6", "C7", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "C0"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0},
+                {"matrix": [0, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1},
+                {"matrix": [1, 9], "x": 12, "y": 1},
+                {"matrix": [1, 10], "x": 13, "y": 1},
+                {"matrix": [1, 11], "x": 14, "y": 1},
+                {"matrix": [1, 12], "x": 15, "y": 1},
+                {"matrix": [1, 13], "x": 16, "y": 1},
+                {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 19, "y": 0.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 8], "x": 10.75, "y": 3},
+                {"matrix": [3, 9], "x": 11.75, "y": 3},
+                {"matrix": [3, 10], "x": 12.75, "y": 3},
+                {"matrix": [3, 11], "x": 13.75, "y": 3},
+                {"matrix": [3, 12], "x": 14.75, "y": 3},
+                {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [2, 14], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.75, "y": 4.25},
+                {"matrix": [3, 14], "x": 18.75, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk
index b43c5121f47..c2ee0bc86f9 100644
--- a/keyboards/basketweave/rules.mk
+++ b/keyboards/basketweave/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c
index 082dbbc3bd4..6e8e3bef106 100644
--- a/keyboards/bastardkb/charybdis/3x5/3x5.c
+++ b/keyboards/bastardkb/charybdis/3x5/3x5.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index a20b2ce636a..1e77de54e94 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index bbb0fd66ba2..05be6acde22 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index cc6c21e8d20..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 4b69b244fbe..61d953ec8f6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index cc6c21e8d20..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 2c0faa95675..f7dd9d2c7e2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index 0a88daf352d..33fda9c2a47 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index af74a299be7..cf9cf2eb62d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c
index a6c7ce07d6e..d2c0a39815c 100644
--- a/keyboards/bastardkb/charybdis/3x6/3x6.c
+++ b/keyboards/bastardkb/charybdis/3x6/3x6.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index bda53275f83..1dbfdb53452 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 69c8bd6fb4f..8bc6a86eaf1 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 6862a8e3095..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 67ada55640e..13283d5b8fa 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 6862a8e3095..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 9b44b3f336c..8dcc8187abb 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index d1ac62e1abe..288e08b9ee9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 4309fd5ee30..c09c9c90ca0 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c
index c7856c12bbb..ff1bbea4704 100644
--- a/keyboards/bastardkb/charybdis/4x6/4x6.c
+++ b/keyboards/bastardkb/charybdis/4x6/4x6.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index b4040e84a5b..5c0b65b7c3d 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index f8de9a3fb13..e2a00339775 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 161d36f45d4..3419eaea8b7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index 51c8c665e26..e1f2bf81f8f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
-# trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 2ee88c4f9e4..bb892c4e6ec 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index 51c8c665e26..e1f2bf81f8f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
-# trackball side).
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 961a0b1420d..48a2eb51584 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 28a1dee31f4..72aa8b59c6e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 8060c758b88..d49755a861a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index 796d22dc713..2190d542c2c 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -6,6 +6,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index b4722fc8e6a..b54403222b4 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor
 
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index 7796a7c3111..9e07843788f 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -6,6 +6,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 227d42fa24d..0de2c9a8071 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor
 
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0a5ba151814..3decc51e846 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dilemma.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
index c80ccbc8eb8..49b24fbd049 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
+++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dilemma.h"
 
 #ifdef SWAP_HANDS_ENABLE
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index 549965444d4..7276c6181fa 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -42,6 +42,3 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
-/* RGB matrix support. */
-#define SPLIT_TRANSPORT_MIRROR
\ No newline at end of file
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 8d7cb4c823a..30f3688cad1 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 3984c69f2fa..4b7e5092199 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index f9069afd911..a7c68fb628a 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 0c7dc406b07..83cfd06ca79 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 377fd4424ac..14386303dc5 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 598ca9d9ee0..d6bea6463ac 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index c0f0d6a3b11..34ca3ff0b2c 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f3eb68587d0..cc5d2adfadd 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 5e5ccd25458..4f245663bce 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index e9c2b345923..fa15c27148e 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index a47464720c0..b34581757ba 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index b384da9dbdc..d7b1fc5cdb4 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
deleted file mode 100644
index 3afca1e792e..00000000000
--- a/keyboards/bastardkb/tbk/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "The Bastard Keyboard",
-    "url": "https://bastardkb.com/",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x1828"
-    },
-    "rgblight": {
-        "led_count": 38,
-        "split_count": [19, 19],
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["D7", "B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_split_4x6_5": {
-            "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": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 1], "x": 15, "y": 0},
-                {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1},
-                {"matrix": [6, 1], "x": 15, "y": 1},
-                {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2},
-                {"matrix": [7, 1], "x": 15, "y": 2},
-                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-                {"matrix": [4, 3], "x": 5, "y": 4},
-                {"matrix": [4, 4], "x": 6, "y": 4},
-                {"matrix": [4, 1], "x": 7, "y": 4},
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-                {"matrix": [4, 5], "x": 6, "y": 5},
-                {"matrix": [4, 2], "x": 7, "y": 5},
-                {"matrix": [9, 2], "x": 9, "y": 5},
-                {"matrix": [9, 5], "x": 10, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bastardkb/tbk/keyboard.json b/keyboards/bastardkb/tbk/keyboard.json
new file mode 100644
index 00000000000..90e37478a1e
--- /dev/null
+++ b/keyboards/bastardkb/tbk/keyboard.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "The Bastard Keyboard",
+    "url": "https://bastardkb.com/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1828"
+    },
+    "rgblight": {
+        "led_count": 38,
+        "split_count": [19, 19],
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_split_4x6_5": {
+            "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": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 1], "x": 15, "y": 1},
+                {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+                {"matrix": [4, 3], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [4, 1], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 5},
+                {"matrix": [4, 2], "x": 7, "y": 5},
+                {"matrix": [9, 2], "x": 9, "y": 5},
+                {"matrix": [9, 5], "x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk
deleted file mode 100644
index 323b24ba201..00000000000
--- a/keyboards/bastardkb/tbk/rules.mk
+++ /dev/null
@@ -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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index c4104608574..bb6e9bb7e9e 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index f246ce0e7ce..54433f39bf3 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index 07bf99658b1..57c7399c01d 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no        # Audio is not supported
 RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 3bcae1df607..2f64d2b51bf 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index e7f01c359dc..b67bc1d744c 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index f62427438b7..d08c89ec574 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -19,6 +19,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A3"
     },
     "development_board": "stemcell"
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
 RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
 RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
 
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = usart
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
deleted file mode 100644
index 6d1ae830ebe..00000000000
--- a/keyboards/bbrfkr/dynamis/info.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-    "keyboard_name": "dynamis",
-    "manufacturer": "bbrfkr",
-    "url": "https://github.com/bbrfkr/keyboards",
-    "maintainer": "bbrfkr",
-    "usb": {
-        "vid": "0x6262",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
-        "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B7", "pin_b": "E6"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "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": "qmk-dfu",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [5, 6], "x": 7, "y": 0},
-                {"matrix": [5, 5], "x": 8, "y": 0},
-                {"matrix": [5, 4], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [9, 0], "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": [6, 6], "x": 7.5, "y": 1},
-                {"matrix": [6, 5], "x": 8.5, "y": 1},
-                {"matrix": [6, 4], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 2], "x": 11.5, "y": 1},
-                {"matrix": [6, 1], "x": 12.5, "y": 1},
-                {"matrix": [6, 0], "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": [7, 6], "x": 7.75, "y": 2},
-                {"matrix": [7, 5], "x": 8.75, "y": 2},
-                {"matrix": [7, 4], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 0], "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": [8, 6], "x": 7.25, "y": 3},
-                {"matrix": [8, 5], "x": 8.25, "y": 3},
-                {"matrix": [8, 4], "x": 9.25, "y": 3},
-                {"matrix": [8, 3], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 0], "x": 14, "y": 3},
-
-                {"matrix": [9, 1], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 4], "x": 14.25, "y": 4},
-                {"matrix": [9, 3], "x": 15.25, "y": 4},
-                {"matrix": [9, 2], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [5, 6], "x": 7, "y": 0},
-                {"matrix": [5, 5], "x": 8, "y": 0},
-                {"matrix": [5, 4], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 2], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 0], "x": 13, "y": 0},
-                {"matrix": [9, 0], "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": [6, 6], "x": 7.5, "y": 1},
-                {"matrix": [6, 5], "x": 8.5, "y": 1},
-                {"matrix": [6, 4], "x": 9.5, "y": 1},
-                {"matrix": [6, 3], "x": 10.5, "y": 1},
-                {"matrix": [6, 2], "x": 11.5, "y": 1},
-                {"matrix": [6, 1], "x": 12.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": [7, 6], "x": 7.75, "y": 2},
-                {"matrix": [7, 5], "x": 8.75, "y": 2},
-                {"matrix": [7, 4], "x": 9.75, "y": 2},
-                {"matrix": [7, 3], "x": 10.75, "y": 2},
-                {"matrix": [7, 2], "x": 11.75, "y": 2},
-                {"matrix": [7, 1], "x": 12.75, "y": 2},
-                {"matrix": [7, 0], "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": [8, 6], "x": 7.25, "y": 3},
-                {"matrix": [8, 5], "x": 8.25, "y": 3},
-                {"matrix": [8, 4], "x": 9.25, "y": 3},
-                {"matrix": [8, 3], "x": 10.25, "y": 3},
-                {"matrix": [8, 2], "x": 11.25, "y": 3},
-                {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 0], "x": 14, "y": 3},
-
-                {"matrix": [9, 1], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 4], "x": 14.25, "y": 4},
-                {"matrix": [9, 3], "x": 15.25, "y": 4},
-                {"matrix": [9, 2], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bbrfkr/dynamis/keyboard.json b/keyboards/bbrfkr/dynamis/keyboard.json
new file mode 100644
index 00000000000..dc9b6cf5848
--- /dev/null
+++ b/keyboards/bbrfkr/dynamis/keyboard.json
@@ -0,0 +1,212 @@
+{
+    "keyboard_name": "dynamis",
+    "manufacturer": "bbrfkr",
+    "url": "https://github.com/bbrfkr/keyboards",
+    "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0x6262",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true,
+        "pointing_device": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B7", "pin_b": "E6"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "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": "qmk-dfu",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 6], "x": 7, "y": 0},
+                {"matrix": [5, 5], "x": 8, "y": 0},
+                {"matrix": [5, 4], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [9, 0], "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": [6, 6], "x": 7.5, "y": 1},
+                {"matrix": [6, 5], "x": 8.5, "y": 1},
+                {"matrix": [6, 4], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 1], "x": 12.5, "y": 1},
+                {"matrix": [6, 0], "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": [7, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 5], "x": 8.75, "y": 2},
+                {"matrix": [7, 4], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 0], "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": [8, 6], "x": 7.25, "y": 3},
+                {"matrix": [8, 5], "x": 8.25, "y": 3},
+                {"matrix": [8, 4], "x": 9.25, "y": 3},
+                {"matrix": [8, 3], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 0], "x": 14, "y": 3},
+
+                {"matrix": [9, 1], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 2], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 6], "x": 7, "y": 0},
+                {"matrix": [5, 5], "x": 8, "y": 0},
+                {"matrix": [5, 4], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 0], "x": 13, "y": 0},
+                {"matrix": [9, 0], "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": [6, 6], "x": 7.5, "y": 1},
+                {"matrix": [6, 5], "x": 8.5, "y": 1},
+                {"matrix": [6, 4], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 2], "x": 11.5, "y": 1},
+                {"matrix": [6, 1], "x": 12.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": [7, 6], "x": 7.75, "y": 2},
+                {"matrix": [7, 5], "x": 8.75, "y": 2},
+                {"matrix": [7, 4], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 2], "x": 11.75, "y": 2},
+                {"matrix": [7, 1], "x": 12.75, "y": 2},
+                {"matrix": [7, 0], "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": [8, 6], "x": 7.25, "y": 3},
+                {"matrix": [8, 5], "x": 8.25, "y": 3},
+                {"matrix": [8, 4], "x": 9.25, "y": 3},
+                {"matrix": [8, 3], "x": 10.25, "y": 3},
+                {"matrix": [8, 2], "x": 11.25, "y": 3},
+                {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 0], "x": 14, "y": 3},
+
+                {"matrix": [9, 1], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 3], "x": 15.25, "y": 4},
+                {"matrix": [9, 2], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bbrfkr/dynamis/rules.mk b/keyboards/bbrfkr/dynamis/rules.mk
index aef3d2a28a0..fab9162dc64 100644
--- a/keyboards/bbrfkr/dynamis/rules.mk
+++ b/keyboards/bbrfkr/dynamis/rules.mk
@@ -1,17 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = no
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
deleted file mode 100644
index 81ada21b71e..00000000000
--- a/keyboards/bear_face/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 chemicalwill <https://github.com/chemicalwill>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
index 24dd696e9b4..ad12468d56f 100644
--- a/keyboards/bear_face/info.json
+++ b/keyboards/bear_face/info.json
@@ -18,6 +18,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
         "rows": ["F5", "F6", "F4", "F1", "B0", "B6"]
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
deleted file mode 100644
index f482b43c10b..00000000000
--- a/keyboards/beatervan/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* Copyright 2020 OJtheTiny
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/beatervan/keyboard.json b/keyboards/beatervan/keyboard.json
index 4828127d14b..27d0f3e5352 100644
--- a/keyboards/beatervan/keyboard.json
+++ b/keyboards/beatervan/keyboard.json
@@ -17,6 +17,12 @@
     "nkro": true,
     "unicode": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
     "rows": ["D1", "D0", "D4", "C6"]
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/keyboard.json
similarity index 100%
rename from keyboards/beekeeb/piantor/info.json
rename to keyboards/beekeeb/piantor/keyboard.json
diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/keyboard.json
similarity index 100%
rename from keyboards/beekeeb/piantor_pro/info.json
rename to keyboards/beekeeb/piantor_pro/keyboard.json
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
deleted file mode 100644
index 70873aa5274..00000000000
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true
-        }
-    },
-    "tapping": {
-        "term": 175
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"],
-        "rows": ["D4", "D7", "B6", "B4", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev1/keyboard.json b/keyboards/bemeier/bmek/rev1/keyboard.json
new file mode 100644
index 00000000000..5f559009667
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev1/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"],
+        "rows": ["D4", "D7", "B6", "B4", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev1/rules.mk b/keyboards/bemeier/bmek/rev1/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/rev1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
deleted file mode 100644
index f1440afaf24..00000000000
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true
-        }
-    },
-    "tapping": {
-        "term": 175
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"],
-        "rows": ["F4", "F5", "D7", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev2/keyboard.json b/keyboards/bemeier/bmek/rev2/keyboard.json
new file mode 100644
index 00000000000..f9e264a2143
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev2/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"],
+        "rows": ["F4", "F5", "D7", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev2/rules.mk b/keyboards/bemeier/bmek/rev2/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/rev2/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
deleted file mode 100644
index ac0faf87063..00000000000
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 6,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true
-        }
-    },
-    "tapping": {
-        "term": 175
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"],
-        "rows": ["F1", "B4", "B5", "D6", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev3/keyboard.json b/keyboards/bemeier/bmek/rev3/keyboard.json
new file mode 100644
index 00000000000..3d12f4ee4e1
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev3/keyboard.json
@@ -0,0 +1,38 @@
+{
+    "usb": {
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "sleep_led": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 6,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true
+        }
+    },
+    "tapping": {
+        "term": 175
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"],
+        "rows": ["F1", "B4", "B5", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev3/rules.mk b/keyboards/bemeier/bmek/rev3/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/rev3/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE       = no
-EXTRAKEY_ENABLE       = yes
-CONSOLE_ENABLE        = no
-COMMAND_ENABLE        = no
-SLEEP_LED_ENABLE      = yes
-SPLIT_KEYBOARD        = no
-BACKLIGHT_ENABLE      = no
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE       = yes
-AUDIO_ENABLE          = no
-LTO_ENABLE            = yes
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
deleted file mode 100644
index 179b1172430..00000000000
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
deleted file mode 100644
index 67f27ad6129..00000000000
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "keyboard_name": "Ergo42",
-  "manufacturer": "Biacco42",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xBC42",
-    "pid": "0x0042",
-    "device_version": "1.0.0"
-  },
-  "rgblight": {
-    "led_count": 12
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "matrix_pins": {
-    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-        "soft_serial_pin": "D0"
-    },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x14"
-  },
-  "layouts": {
-    "LAYOUT_ortho_4x14": {
-      "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": [4, 6], "x": 8, "y": 0},
-        {"matrix": [4, 5], "x": 9, "y": 0},
-        {"matrix": [4, 4], "x": 10, "y": 0},
-        {"matrix": [4, 3], "x": 11, "y": 0},
-        {"matrix": [4, 2], "x": 12, "y": 0},
-        {"matrix": [4, 1], "x": 13, "y": 0},
-        {"matrix": [4, 0], "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": [5, 6], "x": 8, "y": 1},
-        {"matrix": [5, 5], "x": 9, "y": 1},
-        {"matrix": [5, 4], "x": 10, "y": 1},
-        {"matrix": [5, 3], "x": 11, "y": 1},
-        {"matrix": [5, 2], "x": 12, "y": 1},
-        {"matrix": [5, 1], "x": 13, "y": 1},
-        {"matrix": [5, 0], "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": [6, 6], "x": 8, "y": 2},
-        {"matrix": [6, 5], "x": 9, "y": 2},
-        {"matrix": [6, 4], "x": 10, "y": 2},
-        {"matrix": [6, 3], "x": 11, "y": 2},
-        {"matrix": [6, 2], "x": 12, "y": 2},
-        {"matrix": [6, 1], "x": 13, "y": 2},
-        {"matrix": [6, 0], "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": [7, 6], "x": 8, "y": 3},
-        {"matrix": [7, 5], "x": 9, "y": 3},
-        {"matrix": [7, 4], "x": 10, "y": 3},
-        {"matrix": [7, 3], "x": 11, "y": 3},
-        {"matrix": [7, 2], "x": 12, "y": 3},
-        {"matrix": [7, 1], "x": 13, "y": 3},
-        {"matrix": [7, 0], "x": 14, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/biacco42/ergo42/rev1/keyboard.json b/keyboards/biacco42/ergo42/rev1/keyboard.json
new file mode 100644
index 00000000000..b3a53bb3a4c
--- /dev/null
+++ b/keyboards/biacco42/ergo42/rev1/keyboard.json
@@ -0,0 +1,112 @@
+{
+  "keyboard_name": "Ergo42",
+  "manufacturer": "Biacco42",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xBC42",
+    "pid": "0x0042",
+    "device_version": "1.0.0"
+  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "rgblight": {
+    "led_count": 12
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x14"
+  },
+  "layouts": {
+    "LAYOUT_ortho_4x14": {
+      "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": [4, 6], "x": 8, "y": 0},
+        {"matrix": [4, 5], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [4, 3], "x": 11, "y": 0},
+        {"matrix": [4, 2], "x": 12, "y": 0},
+        {"matrix": [4, 1], "x": 13, "y": 0},
+        {"matrix": [4, 0], "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": [5, 6], "x": 8, "y": 1},
+        {"matrix": [5, 5], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [5, 3], "x": 11, "y": 1},
+        {"matrix": [5, 2], "x": 12, "y": 1},
+        {"matrix": [5, 1], "x": 13, "y": 1},
+        {"matrix": [5, 0], "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": [6, 6], "x": 8, "y": 2},
+        {"matrix": [6, 5], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [6, 3], "x": 11, "y": 2},
+        {"matrix": [6, 2], "x": 12, "y": 2},
+        {"matrix": [6, 1], "x": 13, "y": 2},
+        {"matrix": [6, 0], "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": [7, 6], "x": 8, "y": 3},
+        {"matrix": [7, 5], "x": 9, "y": 3},
+        {"matrix": [7, 4], "x": 10, "y": 3},
+        {"matrix": [7, 3], "x": 11, "y": 3},
+        {"matrix": [7, 2], "x": 12, "y": 3},
+        {"matrix": [7, 1], "x": 13, "y": 3},
+        {"matrix": [7, 0], "x": 14, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/biacco42/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/biacco42/ergo42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
index 62044b6c13a..18059c0a3bc 100644
--- a/keyboards/biacco42/ergo42/rules.mk
+++ b/keyboards/biacco42/ergo42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = 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
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
deleted file mode 100644
index df5455b3c22..00000000000
--- a/keyboards/biacco42/meishi/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi/keyboard.json b/keyboards/biacco42/meishi/keyboard.json
index d9d37d72fe4..b7d751d83e0 100644
--- a/keyboards/biacco42/meishi/keyboard.json
+++ b/keyboards/biacco42/meishi/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B1", "B3", "B2", "B6"],
         "rows": ["B5"]
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
deleted file mode 100644
index df5455b3c22..00000000000
--- a/keyboards/biacco42/meishi2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi2/keyboard.json b/keyboards/biacco42/meishi2/keyboard.json
index 3a392442f24..2f553681bc7 100644
--- a/keyboards/biacco42/meishi2/keyboard.json
+++ b/keyboards/biacco42/meishi2/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F5", "F6"],
     "rows": ["D7", "E6"]
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
deleted file mode 100644
index 77f51ecf5a2..00000000000
--- a/keyboards/binepad/bn003/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 BINEPAD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/binepad/bn003/keyboard.json b/keyboards/binepad/bn003/keyboard.json
index 695518828ec..440b5f65979 100644
--- a/keyboards/binepad/bn003/keyboard.json
+++ b/keyboards/binepad/bn003/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["B4", "B5", "B6"],
     "rows": ["C6"]
diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json
deleted file mode 100644
index 4b6a49bb9d7..00000000000
--- a/keyboards/binepad/bn009/r1/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "keyboard_name": "BN009 R1",
-    "bootloader": "atmel-dfu",
-      "diode_direction": "COL2ROW",
-      "matrix_pins": {
-          "cols": ["D2", "D1", "D0"],
-          "rows": ["B6", "B5", "B4"]
-      },
-      "processor": "atmega32u4",
-    "usb": {
-      "device_version": "0.0.1"
-    }
-  }
diff --git a/keyboards/binepad/bn009/r1/keyboard.json b/keyboards/binepad/bn009/r1/keyboard.json
new file mode 100644
index 00000000000..c5338c648d8
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "BN009 R1",
+    "build": {
+        "lto": true
+    },
+    "bootloader": "atmel-dfu",
+      "diode_direction": "COL2ROW",
+      "matrix_pins": {
+          "cols": ["D2", "D1", "D0"],
+          "rows": ["B6", "B5", "B4"]
+      },
+      "processor": "atmega32u4",
+    "usb": {
+      "device_version": "0.0.1"
+    }
+  }
diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk
deleted file mode 100644
index 10468472aa9..00000000000
--- a/keyboards/binepad/bn009/r1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2020 Binepad (@binpad)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-LTO_ENABLE = yes
diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk
index 9719de29b8e..ce85c574046 100755
--- a/keyboards/binepad/bnr1/rules.mk
+++ b/keyboards/binepad/bnr1/rules.mk
@@ -1,3 +1 @@
-# This file is mostly left blank
-
 DEFAULT_FOLDER = binepad/bnr1/v2
diff --git a/keyboards/binepad/bnr1/v1/info.json b/keyboards/binepad/bnr1/v1/info.json
deleted file mode 100644
index e67ea81282b..00000000000
--- a/keyboards/binepad/bnr1/v1/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
-    "diode_direction": "COL2ROW",
-    "usb": {
-        "pid": "0x4231",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B0"],
-        "rows": ["E6"]
-    },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {"pin_a": "D6", "pin_b": "D7"}
-        ]
-    }
-}
diff --git a/keyboards/binepad/bnr1/v1/keyboard.json b/keyboards/binepad/bnr1/v1/keyboard.json
new file mode 100644
index 00000000000..ff3e633e191
--- /dev/null
+++ b/keyboards/binepad/bnr1/v1/keyboard.json
@@ -0,0 +1,22 @@
+{
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "diode_direction": "COL2ROW",
+    "usb": {
+        "pid": "0x4231",
+        "device_version": "1.0.0"
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["B0"],
+        "rows": ["E6"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "D6", "pin_b": "D7"}
+        ]
+    }
+}
diff --git a/keyboards/binepad/bnr1/v1/rules.mk b/keyboards/binepad/bnr1/v1/rules.mk
deleted file mode 100644
index ac022b38ca8..00000000000
--- a/keyboards/binepad/bnr1/v1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is mostly left blank
-
-LTO_ENABLE = yes
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index 976841be799..30ce798073d 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
deleted file mode 100644
index a96d1acce57..00000000000
--- a/keyboards/bioi/g60/info.json
+++ /dev/null
@@ -1,549 +0,0 @@
-{
-    "keyboard_name": "BIOI G60",
-    "manufacturer": "Basic IO Instruments",
-    "url": "https://scottywei.github.io/bioi-g60ble/",
-    "maintainer": "scottywei",
-    "usb": {
-        "vid": "0x8101",
-        "pid": "0x6080",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
-        "rows": ["E6", "B0", "F1", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 12
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "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": "B1"
-    },
-    "bluetooth": {
-        "driver": "custom"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "\\", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 12, "y": 3},
-                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
-                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4},
-                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
-                {"label": "Menu", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
-                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_arrow": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
-                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bioi/g60/keyboard.json b/keyboards/bioi/g60/keyboard.json
new file mode 100644
index 00000000000..8d3dd587707
--- /dev/null
+++ b/keyboards/bioi/g60/keyboard.json
@@ -0,0 +1,567 @@
+{
+    "keyboard_name": "BIOI G60",
+    "manufacturer": "Basic IO Instruments",
+    "url": "https://scottywei.github.io/bioi-g60ble/",
+    "maintainer": "scottywei",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x6080",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+        "rows": ["E6", "B0", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 12
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "B1"
+    },
+    "bluetooth": {
+        "driver": "custom"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "\\", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12, "y": 3},
+                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4},
+                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+                {"label": "Menu", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_arrow": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+                {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk
index 3635daac6f3..c383c07affc 100644
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
 
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-LTO_ENABLE = yes            # Reduce firmware size
-BLUETOOTH_ENABLE = yes
-
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 0b4ce9a0907..8e0ef249fef 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
deleted file mode 100644
index 1699f7275e0..00000000000
--- a/keyboards/bioi/g60ble/info.json
+++ /dev/null
@@ -1,471 +0,0 @@
-{
-    "keyboard_name": "BIOI G60 BLE",
-    "manufacturer": "Basic IO Instruments",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x6583",
-        "pid": "0x6080",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
-        "rows": ["E6", "B0", "F1", "F5", "F4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 8
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 36,
-        "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": "B1"
-    },
-    "bluetooth": {
-        "driver": "custom"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_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": [4, 9], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-                {"matrix": [4, 7], "x": 12, "y": 3},
-                {"matrix": [3, 13], "x": 13, "y": 3},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4},
-                {"matrix": [4, 11], "x": 11, "y": 4},
-                {"matrix": [4, 8], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": [4, 9], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        },
-        "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": [4, 9], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [4, 9], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bioi/g60ble/keyboard.json b/keyboards/bioi/g60ble/keyboard.json
new file mode 100644
index 00000000000..2d09fadff08
--- /dev/null
+++ b/keyboards/bioi/g60ble/keyboard.json
@@ -0,0 +1,489 @@
+{
+    "keyboard_name": "BIOI G60 BLE",
+    "manufacturer": "Basic IO Instruments",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6583",
+        "pid": "0x6080",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+        "rows": ["E6", "B0", "F1", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 8
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 36,
+        "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": "B1"
+    },
+    "bluetooth": {
+        "driver": "custom"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_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": [4, 9], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [4, 7], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": [4, 9], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "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": [4, 9], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [4, 9], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
index 6bfcc62d7e0..c383c07affc 100644
--- a/keyboards/bioi/g60ble/rules.mk
+++ b/keyboards/bioi/g60ble/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
 
-# 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 = yes       # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes
-LTO_ENABLE = yes
-
-BLUETOOTH_ENABLE = yes
-
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 2e78cc2a3e1..78f53856f79 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
deleted file mode 100644
index 6cf66b843ac..00000000000
--- a/keyboards/bioi/morgan65/info.json
+++ /dev/null
@@ -1,739 +0,0 @@
-{
-    "keyboard_name": "Morgan65",
-    "manufacturer": "Basic IO Instruments",
-    "url": "",
-    "maintainer": "scottywei",
-    "usb": {
-        "vid": "0x8101",
-        "pid": "0x6581",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
-        "rows": ["E6", "C6", "F4", "B2", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-      "pin": "B6",
-      "levels": 12
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "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": "B1"
-    },
-    "bluetooth": {
-        "driver": "custom"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs",
-        "65_iso_blocker",
-        "65_iso_blocker_split_bs",
-        "65_iso_blocker_tsangan",
-        "65_iso_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-                {"label": "F1", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "F2", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"label": "F3", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "F4", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bioi/morgan65/keyboard.json b/keyboards/bioi/morgan65/keyboard.json
new file mode 100644
index 00000000000..8f83237f82f
--- /dev/null
+++ b/keyboards/bioi/morgan65/keyboard.json
@@ -0,0 +1,757 @@
+{
+    "keyboard_name": "Morgan65",
+    "manufacturer": "Basic IO Instruments",
+    "url": "",
+    "maintainer": "scottywei",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x6581",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true,
+        "bluetooth": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
+        "rows": ["E6", "C6", "F4", "B2", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+      "pin": "B6",
+      "levels": 12
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "B1"
+    },
+    "bluetooth": {
+        "driver": "custom"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+                {"label": "F1", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "F2", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"label": "F3", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "F4", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk
index 3635daac6f3..c383c07affc 100644
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@@ -1,19 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
 
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-LTO_ENABLE = yes            # Reduce firmware size
-BLUETOOTH_ENABLE = yes
-
 UART_DRIVER_REQUIRED = yes
 SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 8134bd96cfa..9f005f2d79f 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/s65/keyboard.json b/keyboards/bioi/s65/keyboard.json
index b34cd9e602c..c55852f31cc 100644
--- a/keyboards/bioi/s65/keyboard.json
+++ b/keyboards/bioi/s65/keyboard.json
@@ -20,6 +20,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"],
         "rows": ["D2", "D0", "D1", "F7", "D6"]
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/blackplum/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/blackplum/keyboard.json b/keyboards/blackplum/keyboard.json
index d17bc378321..277e0eae622 100644
--- a/keyboards/blackplum/keyboard.json
+++ b/keyboards/blackplum/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"],
         "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"]
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
deleted file mode 100644
index aea945a035d..00000000000
--- a/keyboards/blank/blank01/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 gkeyboard
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blank/blank01/keyboard.json b/keyboards/blank/blank01/keyboard.json
index 5dfa7e67ecc..f8af736bef8 100644
--- a/keyboards/blank/blank01/keyboard.json
+++ b/keyboards/blank/blank01/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["D0", "D1", "D2", "D3", "B3"]
diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json
deleted file mode 100644
index 7e783c45b5c..00000000000
--- a/keyboards/blank_tehnologii/manibus/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "keyboard_name": "Manibus",
-    "manufacturer": "Blank Tehnologii",
-    "url": "https://blank.computer/",
-    "maintainer": "SamuraiKek",
-    "debounce": 2,
-    "usb": {
-        "vid": "0x424D",
-        "pid": "0x4D4E",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
-        "rows": ["F4", "F5", "F6", "D3", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["B6", "B5", "D6", "D5", "D3", "D7", "B4"],
-                "rows": ["F5", "F1", "B2", "B1", "C6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 1], "x": 9, "y": 0.25},
-                {"matrix": [5, 2], "x": 10, "y": 0.25},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0.25},
-                {"matrix": [5, 5], "x": 13, "y": 0.5},
-                {"matrix": [5, 6], "x": 14, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 1], "x": 9, "y": 1.25},
-                {"matrix": [6, 2], "x": 10, "y": 1.25},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1.25},
-                {"matrix": [6, 5], "x": 13, "y": 1.5},
-                {"matrix": [6, 6], "x": 14, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 1], "x": 9, "y": 2.25},
-                {"matrix": [7, 2], "x": 10, "y": 2.25},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2.25},
-                {"matrix": [7, 5], "x": 13, "y": 2.5},
-                {"matrix": [7, 6], "x": 14, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75},
-                {"matrix": [3, 1], "x": 1, "y": 3.5},
-                {"matrix": [3, 2], "x": 2, "y": 3.25},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.25},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [8, 1], "x": 9, "y": 3.25},
-                {"matrix": [8, 2], "x": 10, "y": 3.25},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3.25},
-                {"matrix": [8, 5], "x": 13, "y": 3.5},
-                {"matrix": [8, 6], "x": 14, "y": 3.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75},
-                {"matrix": [4, 1], "x": 1, "y": 4.5},
-                {"matrix": [4, 2], "x": 2, "y": 4.25},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4.25},
-                {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5},
-                {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25},
-
-                {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25},
-                {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5},
-                {"matrix": [9, 2], "x": 10, "y": 4.25},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-                {"matrix": [9, 4], "x": 12, "y": 4.25},
-                {"matrix": [9, 5], "x": 13, "y": 4.5},
-                {"matrix": [9, 6], "x": 14, "y": 4.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/blank_tehnologii/manibus/keyboard.json b/keyboards/blank_tehnologii/manibus/keyboard.json
new file mode 100644
index 00000000000..f6cd41758db
--- /dev/null
+++ b/keyboards/blank_tehnologii/manibus/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "Manibus",
+    "manufacturer": "Blank Tehnologii",
+    "url": "https://blank.computer/",
+    "maintainer": "SamuraiKek",
+    "debounce": 2,
+    "usb": {
+        "vid": "0x424D",
+        "pid": "0x4D4E",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
+        "rows": ["F4", "F5", "F6", "D3", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "B5", "D6", "D5", "D3", "D7", "B4"],
+                "rows": ["F5", "F1", "B2", "B1", "C6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 1], "x": 9, "y": 0.25},
+                {"matrix": [5, 2], "x": 10, "y": 0.25},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.25},
+                {"matrix": [5, 5], "x": 13, "y": 0.5},
+                {"matrix": [5, 6], "x": 14, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.5},
+                {"matrix": [6, 6], "x": 14, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 1], "x": 9, "y": 2.25},
+                {"matrix": [7, 2], "x": 10, "y": 2.25},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.25},
+                {"matrix": [7, 5], "x": 13, "y": 2.5},
+                {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [8, 1], "x": 9, "y": 3.25},
+                {"matrix": [8, 2], "x": 10, "y": 3.25},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3.25},
+                {"matrix": [8, 5], "x": 13, "y": 3.5},
+                {"matrix": [8, 6], "x": 14, "y": 3.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.25},
+                {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5},
+                {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25},
+
+                {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25},
+                {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 2], "x": 10, "y": 4.25},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+                {"matrix": [9, 4], "x": 12, "y": 4.25},
+                {"matrix": [9, 5], "x": 13, "y": 4.5},
+                {"matrix": [9, 6], "x": 14, "y": 4.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk
deleted file mode 100644
index 1321ae0d173..00000000000
--- a/keyboards/blank_tehnologii/manibus/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
deleted file mode 100644
index a93b381c85b..00000000000
--- a/keyboards/blockey/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Eucalyn
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blockey/keyboard.json b/keyboards/blockey/keyboard.json
index 0c150420dc9..9710606a522 100644
--- a/keyboards/blockey/keyboard.json
+++ b/keyboards/blockey/keyboard.json
@@ -36,6 +36,12 @@
     "nkro": false,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"],
     "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"]
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
deleted file mode 100644
index 52c859c1540..00000000000
--- a/keyboards/bluebell/swoop/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "keyboard_name": "Swoop",
-  "url": "https://github.com/jimmerricks/swoop",
-  "maintainer": "jmnw",
-  "manufacturer": "jmnw",
-  "usb": {
-    "vid": "0x1804",
-    "pid": "0x3046",
-    "device_version": "1.0.0"
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 36,
-    "max_brightness": 150,
-    "sleep": true,
-    "split_count": [18, 18],
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "static_gradient": true
-    }
-  },
-  "matrix_pins": {
-    "cols": ["B1", "F7", "F6", "F5", "F4"],
-    "rows": ["D4", "C6", "D7", "E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B4", "pin_b": "B5"}
-    ]
-  },
-  "split": {
-    "soft_serial_pin": "D2",
-    "encoder": {
-      "right": {
-        "rotary": [
-          {"pin_a": "B5", "pin_b": "B4"}
-        ]
-      }
-    }
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "community_layouts": ["split_3x5_3"],
-  "layouts": {
-    "LAYOUT_split_3x5_3": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.125},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0.125},
-        {"matrix": [0, 4], "x": 4, "y": 0.25},
-
-        {"matrix": [4, 4], "x": 8, "y": 0.25},
-        {"matrix": [4, 3], "x": 9, "y": 0.125},
-        {"matrix": [4, 2], "x": 10, "y": 0},
-        {"matrix": [4, 1], "x": 11, "y": 0.125},
-        {"matrix": [4, 0], "x": 12, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.125},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1.125},
-        {"matrix": [1, 4], "x": 4, "y": 1.25},
-
-        {"matrix": [5, 4], "x": 8, "y": 1.25},
-        {"matrix": [5, 3], "x": 9, "y": 1.125},
-        {"matrix": [5, 2], "x": 10, "y": 1},
-        {"matrix": [5, 1], "x": 11, "y": 1.125},
-        {"matrix": [5, 0], "x": 12, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.125},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2.125},
-        {"matrix": [2, 4], "x": 4, "y": 2.25},
-
-        {"matrix": [6, 4], "x": 8, "y": 2.25},
-        {"matrix": [6, 3], "x": 9, "y": 2.125},
-        {"matrix": [6, 2], "x": 10, "y": 2},
-        {"matrix": [6, 1], "x": 11, "y": 2.125},
-        {"matrix": [6, 0], "x": 12, "y": 2.375},
-
-        {"matrix": [3, 2], "x": 2.875, "y": 3.25},
-        {"matrix": [3, 3], "x": 4, "y": 3.375},
-        {"matrix": [3, 4], "x": 5.125, "y": 3.625},
-
-        {"matrix": [7, 4], "x": 6.875, "y": 3.625},
-        {"matrix": [7, 3], "x": 8, "y": 3.375},
-        {"matrix": [7, 2], "x": 9.125, "y": 3.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/bluebell/swoop/keyboard.json b/keyboards/bluebell/swoop/keyboard.json
new file mode 100644
index 00000000000..5cc29818b86
--- /dev/null
+++ b/keyboards/bluebell/swoop/keyboard.json
@@ -0,0 +1,106 @@
+{
+  "keyboard_name": "Swoop",
+  "url": "https://github.com/jimmerricks/swoop",
+  "maintainer": "jmnw",
+  "manufacturer": "jmnw",
+  "usb": {
+    "vid": "0x1804",
+    "pid": "0x3046",
+    "device_version": "1.0.0"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 36,
+    "max_brightness": 150,
+    "sleep": true,
+    "split_count": [18, 18],
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "static_gradient": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D4", "C6", "D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "B5"}
+    ]
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2",
+    "encoder": {
+      "right": {
+        "rotary": [
+          {"pin_a": "B5", "pin_b": "B4"}
+        ]
+      }
+    }
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "community_layouts": ["split_3x5_3"],
+  "layouts": {
+    "LAYOUT_split_3x5_3": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.125},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 8, "y": 0.25},
+        {"matrix": [4, 3], "x": 9, "y": 0.125},
+        {"matrix": [4, 2], "x": 10, "y": 0},
+        {"matrix": [4, 1], "x": 11, "y": 0.125},
+        {"matrix": [4, 0], "x": 12, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.125},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.125},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 8, "y": 1.25},
+        {"matrix": [5, 3], "x": 9, "y": 1.125},
+        {"matrix": [5, 2], "x": 10, "y": 1},
+        {"matrix": [5, 1], "x": 11, "y": 1.125},
+        {"matrix": [5, 0], "x": 12, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.125},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.125},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 8, "y": 2.25},
+        {"matrix": [6, 3], "x": 9, "y": 2.125},
+        {"matrix": [6, 2], "x": 10, "y": 2},
+        {"matrix": [6, 1], "x": 11, "y": 2.125},
+        {"matrix": [6, 0], "x": 12, "y": 2.375},
+
+        {"matrix": [3, 2], "x": 2.875, "y": 3.25},
+        {"matrix": [3, 3], "x": 4, "y": 3.375},
+        {"matrix": [3, 4], "x": 5.125, "y": 3.625},
+
+        {"matrix": [7, 4], "x": 6.875, "y": 3.625},
+        {"matrix": [7, 3], "x": 8, "y": 3.375},
+        {"matrix": [7, 2], "x": 9.125, "y": 3.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk
deleted file mode 100644
index fc87c614046..00000000000
--- a/keyboards/bluebell/swoop/rules.mk
+++ /dev/null
@@ -1,11 +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
-RGBLIGHT_ENABLE = yes       # Enable underlight
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardrun/bizarre/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/bizarre/keyboard.json b/keyboards/boardrun/bizarre/keyboard.json
index 6901f93625d..f61f3b053f1 100644
--- a/keyboards/boardrun/bizarre/keyboard.json
+++ b/keyboards/boardrun/bizarre/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
         "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardrun/classic/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/classic/keyboard.json b/keyboards/boardrun/classic/keyboard.json
index cd83ef58f06..4831131f18f 100644
--- a/keyboards/boardrun/classic/keyboard.json
+++ b/keyboards/boardrun/classic/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
         "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
deleted file mode 100644
index 054779f6fe1..00000000000
--- a/keyboards/boardsource/equals/48/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "Equals 48",
-    "bootloader": "rp2040",
-    "processor": "RP2040",
-    "features": {
-        "audio":true
-    },
-    "matrix_pins": {
-        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
-        "rows": ["GP12", "GP13", "GP16", "GP17"]
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP21"
-    },
-    "rgb_matrix": {
-        "layout": [
-            { "flags": 2, "x": 220, "y": 17 },
-            { "flags": 2, "x": 172, "y": 17 },
-            { "flags": 2, "x": 112, "y": 17 },
-            { "flags": 2, "x": 50, "y": 17 },
-            { "flags": 2, "x": 4, "y": 17 },
-            { "flags": 2, "x": 4, "y": 56 },
-            { "flags": 2, "x": 50, "y": 56 },
-            { "flags": 2, "x": 112, "y": 56 },
-            { "flags": 2, "x": 172, "y": 56 },
-            { "flags": 2, "x": 220, "y": 56 },
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
-            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
-            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
-            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
-            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
-            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
-            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
-            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
-            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
-            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
-            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
-            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
-            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
-            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
-            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
-            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
-            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
-            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
-            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
-            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
-            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
-            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
-            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
-            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
-            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
-            { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 },
-            { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 },
-            { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 },
-            { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 },
-            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
-            { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 },
-            { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 },
-            { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 },
-            { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 },
-            { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 },
-            { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }
-        ]
-    },
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
-                { "matrix": [0, 11], "x": 11, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-                { "matrix": [1, 10], "x": 10, "y": 1 },
-                { "matrix": [1, 11], "x": 11, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-                { "matrix": [2, 10], "x": 10, "y": 2 },
-                { "matrix": [2, 11], "x": 11, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 5], "x": 5, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 },
-                { "matrix": [3, 9], "x": 9, "y": 3 },
-                { "matrix": [3, 10], "x": 10, "y": 3 },
-                { "matrix": [3, 11], "x": 11, "y": 3 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/boardsource/equals/48/keyboard.json b/keyboards/boardsource/equals/48/keyboard.json
new file mode 100644
index 00000000000..5b633559313
--- /dev/null
+++ b/keyboards/boardsource/equals/48/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "Equals 48",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "audio":true,
+        "quantum_painter": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+        "rows": ["GP12", "GP13", "GP16", "GP17"]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP21"
+    },
+    "rgb_matrix": {
+        "layout": [
+            { "flags": 2, "x": 220, "y": 17 },
+            { "flags": 2, "x": 172, "y": 17 },
+            { "flags": 2, "x": 112, "y": 17 },
+            { "flags": 2, "x": 50, "y": 17 },
+            { "flags": 2, "x": 4, "y": 17 },
+            { "flags": 2, "x": 4, "y": 56 },
+            { "flags": 2, "x": 50, "y": 56 },
+            { "flags": 2, "x": 112, "y": 56 },
+            { "flags": 2, "x": 172, "y": 56 },
+            { "flags": 2, "x": 220, "y": 56 },
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+            { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 },
+            { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 },
+            { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 },
+            { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+            { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 },
+            { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 },
+            { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 },
+            { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 },
+            { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 },
+            { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }
+        ]
+    },
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "x": 11, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk
index 4192b0c2e54..2f75fc139fc 100644
--- a/keyboards/boardsource/equals/48/rules.mk
+++ b/keyboards/boardsource/equals/48/rules.mk
@@ -1,3 +1,2 @@
 AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
deleted file mode 100644
index da3fc3691a6..00000000000
--- a/keyboards/boardsource/equals/60/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-    "keyboard_name": "Equals 60",
-    "bootloader": "rp2040",
-    "processor": "RP2040",
-    "features": {
-        "audio":true
-    },
-    "matrix_pins": {
-        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
-        "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP21"
-    },
-    "rgb_matrix": {
-        "layout": [
-            { "flags": 2, "x": 220, "y": 17 },
-            { "flags": 2, "x": 172, "y": 17 },
-            { "flags": 2, "x": 112, "y": 17 },
-            { "flags": 2, "x": 50, "y": 17 },
-            { "flags": 2, "x": 4, "y": 17 },
-            { "flags": 2, "x": 4, "y": 56 },
-            { "flags": 2, "x": 50, "y": 56 },
-            { "flags": 2, "x": 112, "y": 56 },
-            { "flags": 2, "x": 172, "y": 56 },
-            { "flags": 2, "x": 220, "y": 56 },
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
-            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
-            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
-            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
-            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
-            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
-            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
-            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
-            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
-            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
-            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
-            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
-            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
-            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
-            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
-            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
-            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
-            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
-            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
-            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
-            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
-            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
-            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
-            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
-            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
-            { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
-            { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
-            { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
-            { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
-            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
-            { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
-            { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
-            { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
-            { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 },
-            { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 },
-            { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 },
-            { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
-            { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
-            { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
-            { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
-            { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
-            { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
-            { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
-            { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
-            { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
-            { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
-            { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
-        ]
-    },
-    "community_layouts": ["ortho_5x12"],
-    "layouts": {
-        "LAYOUT_ortho_5x12": {
-            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
-                { "matrix": [0, 11], "x": 11, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-                { "matrix": [1, 10], "x": 10, "y": 1 },
-                { "matrix": [1, 11], "x": 11, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-                { "matrix": [2, 10], "x": 10, "y": 2 },
-                { "matrix": [2, 11], "x": 11, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 5], "x": 5, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 },
-                { "matrix": [3, 9], "x": 9, "y": 3 },
-                { "matrix": [3, 10], "x": 10, "y": 3 },
-                { "matrix": [3, 11], "x": 11, "y": 3 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 2], "x": 2, "y": 4 },
-                { "matrix": [4, 3], "x": 3, "y": 4 },
-                { "matrix": [4, 4], "x": 4, "y": 4 },
-                { "matrix": [4, 5], "x": 5, "y": 4 },
-                { "matrix": [4, 6], "x": 6, "y": 4 },
-                { "matrix": [4, 7], "x": 7, "y": 4 },
-                { "matrix": [4, 8], "x": 8, "y": 4 },
-                { "matrix": [4, 9], "x": 9, "y": 4 },
-                { "matrix": [4, 10], "x": 10, "y": 4 },
-                { "matrix": [4, 11], "x": 11, "y": 4 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/boardsource/equals/60/keyboard.json b/keyboards/boardsource/equals/60/keyboard.json
new file mode 100644
index 00000000000..3bc1f49be38
--- /dev/null
+++ b/keyboards/boardsource/equals/60/keyboard.json
@@ -0,0 +1,157 @@
+{
+    "keyboard_name": "Equals 60",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "features": {
+        "audio":true,
+        "quantum_painter": true
+    },
+    "matrix_pins": {
+        "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+        "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP21"
+    },
+    "rgb_matrix": {
+        "layout": [
+            { "flags": 2, "x": 220, "y": 17 },
+            { "flags": 2, "x": 172, "y": 17 },
+            { "flags": 2, "x": 112, "y": 17 },
+            { "flags": 2, "x": 50, "y": 17 },
+            { "flags": 2, "x": 4, "y": 17 },
+            { "flags": 2, "x": 4, "y": 56 },
+            { "flags": 2, "x": 50, "y": 56 },
+            { "flags": 2, "x": 112, "y": 56 },
+            { "flags": 2, "x": 172, "y": 56 },
+            { "flags": 2, "x": 220, "y": 56 },
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+            { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+            { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+            { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+            { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+            { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+            { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+            { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+            { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+            { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+            { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+            { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+            { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+            { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+            { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+            { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+            { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+            { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+            { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+            { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+            { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
+            { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
+            { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
+            { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
+            { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+            { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
+            { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
+            { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
+            { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 },
+            { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 },
+            { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 },
+            { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
+            { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
+            { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
+            { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
+            { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
+            { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
+            { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
+            { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
+            { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
+            { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
+            { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
+        ]
+    },
+    "community_layouts": ["ortho_5x12"],
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1 },
+                { "matrix": [1, 5], "x": 5, "y": 1 },
+                { "matrix": [1, 6], "x": 6, "y": 1 },
+                { "matrix": [1, 7], "x": 7, "y": 1 },
+                { "matrix": [1, 8], "x": 8, "y": 1 },
+                { "matrix": [1, 9], "x": 9, "y": 1 },
+                { "matrix": [1, 10], "x": 10, "y": 1 },
+                { "matrix": [1, 11], "x": 11, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 5], "x": 5, "y": 2 },
+                { "matrix": [2, 6], "x": 6, "y": 2 },
+                { "matrix": [2, 7], "x": 7, "y": 2 },
+                { "matrix": [2, 8], "x": 8, "y": 2 },
+                { "matrix": [2, 9], "x": 9, "y": 2 },
+                { "matrix": [2, 10], "x": 10, "y": 2 },
+                { "matrix": [2, 11], "x": 11, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 },
+                { "matrix": [3, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 5], "x": 5, "y": 3 },
+                { "matrix": [3, 6], "x": 6, "y": 3 },
+                { "matrix": [3, 7], "x": 7, "y": 3 },
+                { "matrix": [3, 8], "x": 8, "y": 3 },
+                { "matrix": [3, 9], "x": 9, "y": 3 },
+                { "matrix": [3, 10], "x": 10, "y": 3 },
+                { "matrix": [3, 11], "x": 11, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1, "y": 4 },
+                { "matrix": [4, 2], "x": 2, "y": 4 },
+                { "matrix": [4, 3], "x": 3, "y": 4 },
+                { "matrix": [4, 4], "x": 4, "y": 4 },
+                { "matrix": [4, 5], "x": 5, "y": 4 },
+                { "matrix": [4, 6], "x": 6, "y": 4 },
+                { "matrix": [4, 7], "x": 7, "y": 4 },
+                { "matrix": [4, 8], "x": 8, "y": 4 },
+                { "matrix": [4, 9], "x": 9, "y": 4 },
+                { "matrix": [4, 10], "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk
index 4192b0c2e54..2f75fc139fc 100644
--- a/keyboards/boardsource/equals/60/rules.mk
+++ b/keyboards/boardsource/equals/60/rules.mk
@@ -1,3 +1,2 @@
 AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
 QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/keyboard.json
similarity index 100%
rename from keyboards/boardsource/lulu/rp2040/info.json
rename to keyboards/boardsource/lulu/rp2040/keyboard.json
diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/keyboard.json
similarity index 100%
rename from keyboards/boardsource/unicorne/info.json
rename to keyboards/boardsource/unicorne/keyboard.json
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardwalk/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardwalk/keyboard.json b/keyboards/boardwalk/keyboard.json
index 8c4ad37eb09..6fb7673ec8a 100644
--- a/keyboards/boardwalk/keyboard.json
+++ b/keyboards/boardwalk/keyboard.json
@@ -39,6 +39,12 @@
         "rgblight": true,
         "unicode": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
         "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 7d7310ec0ec..e80e4994396 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -16,11 +16,5 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* Unicode select mode */
 #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/bop/keyboard.json b/keyboards/bop/keyboard.json
index 81bbbf33f08..6a88bb46177 100644
--- a/keyboards/bop/keyboard.json
+++ b/keyboards/bop/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"],
         "rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 483c57940c3..aad033d221d 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -20,11 +20,6 @@
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define RGBLIGHT_LAYERS
 
 //The 3D-printed version of Boston uses APA106 LEDs, which are reversed
diff --git a/keyboards/boston/keyboard.json b/keyboards/boston/keyboard.json
index 1960df6d45f..050076c7a69 100644
--- a/keyboards/boston/keyboard.json
+++ b/keyboards/boston/keyboard.json
@@ -30,7 +30,11 @@
         ]
     },
     "qmk": {
-        "tap_keycode_delay": 15
+        "tap_keycode_delay": 15,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "backlight": {
         "pin": "A6",
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
deleted file mode 100644
index 981d4de7c8d..00000000000
--- a/keyboards/boston_meetup/2019/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "usb": {
-        "device_version": "20.1.9"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
-    "matrix_pins": {
-        "cols": ["A7", "A8", "B2", "B10"],
-        "rows": ["A3", "B8", "B9", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B13", "pin_b": "B14"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 10,
-        "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"
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 6
-}
diff --git a/keyboards/boston_meetup/2019/keyboard.json b/keyboards/boston_meetup/2019/keyboard.json
new file mode 100644
index 00000000000..97990bb5030
--- /dev/null
+++ b/keyboards/boston_meetup/2019/keyboard.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "Boston Meetup Board",
+    "manufacturer": "ishtob",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0xFB30",
+      "pid": "0x26BE",
+      "device_version": "20.1.9"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "haptic": true,
+        "oled": true
+    },
+    "rgb_matrix": {
+        "driver": "ws2812"
+    },
+    "matrix_pins": {
+        "cols": ["A7", "A8", "B2", "B10"],
+        "rows": ["A3", "B8", "B9", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B13", "pin_b": "B14"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 10,
+        "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"
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "debounce": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index f5ef6ba5a26..dea510c2ab3 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes          # Audio output
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
deleted file mode 100644
index 3156c643c96..00000000000
--- a/keyboards/boston_meetup/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "keyboard_name": "Boston Meetup Board",
-  "manufacturer": "ishtob",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFB30",
-    "pid": "0x26BE"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "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/boston_meetup/rules.mk b/keyboards/boston_meetup/rules.mk
index 6dd899edc85..6d6745a0e57 100644
--- a/keyboards/boston_meetup/rules.mk
+++ b/keyboards/boston_meetup/rules.mk
@@ -1,2 +1 @@
-
 DEFAULT_FOLDER = boston_meetup/2019
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/box75/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/box75/keyboard.json b/keyboards/box75/keyboard.json
index 8932f81ae72..89afff17161 100644
--- a/keyboards/box75/keyboard.json
+++ b/keyboards/box75/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"],
         "rows": ["A10", "A9", "B12", "A2", "A1", "A0"]
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/bpiphany/four_banger/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/bpiphany/four_banger/keyboard.json b/keyboards/bpiphany/four_banger/keyboard.json
index 24620506849..a368fbfe61b 100644
--- a/keyboards/bpiphany/four_banger/keyboard.json
+++ b/keyboards/bpiphany/four_banger/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "B4"],
         "rows": ["B2", "B6"]
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 8a895c3e50b..37c868b47f3 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 }
 #define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 95fbd477eb5..33a2f792d97 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -8,6 +8,12 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "dynamic_keymap": {
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
deleted file mode 100644
index 49b6e103092..00000000000
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-    "keyboard_name": "Ghost Squid",
-    "manufacturer": "Bathroom Epiphanies",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6050",
-        "device_version": "1.0.4"
-    },
-    "indicators": {
-        "caps_lock": "C6",
-        "num_lock": "C5",
-        "scroll_lock": "B7",
-        "on_state": 0
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [
-        "fullsize_ansi",
-        "fullsize_iso"
-    ],
-    "layouts": {
-        "LAYOUT_fullsize_ansi": {
-            "layout": [
-                {"matrix": [6, 9], "x": 0, "y": 0},
-
-                {"matrix": [4, 8], "x": 2, "y": 0},
-                {"matrix": [4, 7], "x": 3, "y": 0},
-                {"matrix": [2, 7], "x": 4, "y": 0},
-                {"matrix": [6, 7], "x": 5, "y": 0},
-
-                {"matrix": [7, 0], "x": 6.5, "y": 0},
-                {"matrix": [6, 4], "x": 7.5, "y": 0},
-                {"matrix": [2, 3], "x": 8.5, "y": 0},
-                {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [6, 1], "x": 13, "y": 0},
-                {"matrix": [0, 1], "x": 14, "y": 0},
-
-                {"matrix": [7, 2], "x": 15.25, "y": 0},
-                {"matrix": [5, 2], "x": 16.25, "y": 0},
-                {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-                {"matrix": [4, 9], "x": 0, "y": 1.25},
-                {"matrix": [7, 9], "x": 1, "y": 1.25},
-                {"matrix": [7, 8], "x": 2, "y": 1.25},
-                {"matrix": [7, 7], "x": 3, "y": 1.25},
-                {"matrix": [7, 6], "x": 4, "y": 1.25},
-                {"matrix": [4, 6], "x": 5, "y": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 1.25},
-                {"matrix": [7, 5], "x": 7, "y": 1.25},
-                {"matrix": [7, 4], "x": 8, "y": 1.25},
-                {"matrix": [7, 3], "x": 9, "y": 1.25},
-                {"matrix": [7, 17], "x": 10, "y": 1.25},
-                {"matrix": [4, 17], "x": 11, "y": 1.25},
-                {"matrix": [4, 4], "x": 12, "y": 1.25},
-                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
-                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
-                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
-                {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
-                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
-                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
-                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
-                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
-                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
-                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
-                {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
-                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
-                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
-
-                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
-                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
-                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
-                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
-                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
-                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
-                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
-                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
-                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
-
-                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
-                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
-                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
-                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_fullsize_iso": {
-            "layout": [
-                {"matrix": [6, 9], "x": 0, "y": 0},
-
-                {"matrix": [4, 8], "x": 2, "y": 0},
-                {"matrix": [4, 7], "x": 3, "y": 0},
-                {"matrix": [2, 7], "x": 4, "y": 0},
-                {"matrix": [6, 7], "x": 5, "y": 0},
-
-                {"matrix": [7, 0], "x": 6.5, "y": 0},
-                {"matrix": [6, 4], "x": 7.5, "y": 0},
-                {"matrix": [2, 3], "x": 8.5, "y": 0},
-                {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [6, 1], "x": 13, "y": 0},
-                {"matrix": [0, 1], "x": 14, "y": 0},
-
-                {"matrix": [7, 2], "x": 15.25, "y": 0},
-                {"matrix": [5, 2], "x": 16.25, "y": 0},
-                {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-                {"matrix": [4, 9], "x": 0, "y": 1.25},
-                {"matrix": [7, 9], "x": 1, "y": 1.25},
-                {"matrix": [7, 8], "x": 2, "y": 1.25},
-                {"matrix": [7, 7], "x": 3, "y": 1.25},
-                {"matrix": [7, 6], "x": 4, "y": 1.25},
-                {"matrix": [4, 6], "x": 5, "y": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 1.25},
-                {"matrix": [7, 5], "x": 7, "y": 1.25},
-                {"matrix": [7, 4], "x": 8, "y": 1.25},
-                {"matrix": [7, 3], "x": 9, "y": 1.25},
-                {"matrix": [7, 17], "x": 10, "y": 1.25},
-                {"matrix": [4, 17], "x": 11, "y": 1.25},
-                {"matrix": [4, 4], "x": 12, "y": 1.25},
-                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
-                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
-                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
-                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
-
-                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
-                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
-                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
-
-                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
-                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
-                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
-                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
-                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
-                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
-                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
-                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 1], "x": 12.75, "y": 3.25},
-                {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
-                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
-                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
-
-                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [6, 8], "x": 1.25, "y": 4.25},
-                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
-                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
-                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
-                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
-                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
-                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
-                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
-                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
-                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
-
-                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
-                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
-                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
-                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
-                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
-                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bpiphany/ghost_squid/keyboard.json b/keyboards/bpiphany/ghost_squid/keyboard.json
new file mode 100644
index 00000000000..85f6f0fa8e8
--- /dev/null
+++ b/keyboards/bpiphany/ghost_squid/keyboard.json
@@ -0,0 +1,283 @@
+{
+    "keyboard_name": "Ghost Squid",
+    "manufacturer": "Bathroom Epiphanies",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6050",
+        "device_version": "1.0.4"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "indicators": {
+        "caps_lock": "C6",
+        "num_lock": "C5",
+        "scroll_lock": "B7",
+        "on_state": 0
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "community_layouts": [
+        "fullsize_ansi",
+        "fullsize_iso"
+    ],
+    "layouts": {
+        "LAYOUT_fullsize_ansi": {
+            "layout": [
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                {"matrix": [6, 9], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index f53bdd83377..52305bba744 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Layer 1: Function layer */
     [_MD] = LAYOUT_fullsize_iso(
-        _______,          _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, QK_BOOT,
+        _______,          _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GU_TOGG, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, QK_BOOT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,    _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
diff --git a/keyboards/bpiphany/ghost_squid/matrix.c b/keyboards/bpiphany/ghost_squid/matrix.c
index b0ad6075554..802d365cb89 100644
--- a/keyboards/bpiphany/ghost_squid/matrix.c
+++ b/keyboards/bpiphany/ghost_squid/matrix.c
@@ -17,7 +17,6 @@
 */
 
 #include "matrix.h"
-#include "quantum.h"
 
 matrix_row_t read_rows(void) {
     return
diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk
index 2f6a5a7346e..30ce5d293b7 100644
--- a/keyboards/bpiphany/ghost_squid/rules.mk
+++ b/keyboards/bpiphany/ghost_squid/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 SRC += matrix.c
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 2e41e1f7005..8ba4e7c73b5 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -24,11 +24,6 @@
 
 // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
deleted file mode 100644
index 82fd77781a0..00000000000
--- a/keyboards/bpiphany/hid_liber/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "keyboard_name": "HIDLiberation",
-    "manufacturer": "bpiphany",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xB919",
-        "device_version": "0.0.1"
-    },
-    "indicators": {
-        "caps_lock": "B5",
-        "scroll_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [6, 1], "x": 0, "y": 0},
-
-                {"matrix": [7, 7], "x": 2, "y": 0},
-                {"matrix": [9, 7], "x": 3, "y": 0},
-                {"matrix": [9, 6], "x": 4, "y": 0},
-                {"matrix": [9, 1], "x": 5, "y": 0},
-
-                {"matrix": [14, 5], "x": 6.5, "y": 0},
-                {"matrix": [11, 1], "x": 7.5, "y": 0},
-                {"matrix": [0, 6], "x": 8.5, "y": 0},
-                {"matrix": [0, 7], "x": 9.5, "y": 0},
-
-                {"matrix": [3, 7], "x": 11, "y": 0},
-                {"matrix": [3, 5], "x": 12, "y": 0},
-                {"matrix": [3, 1], "x": 13, "y": 0},
-                {"matrix": [3, 2], "x": 14, "y": 0},
-
-                {"matrix": [1, 5], "x": 15.25, "y": 0},
-                {"matrix": [1, 3], "x": 16.25, "y": 0},
-                {"matrix": [14, 3], "x": 17.25, "y": 0},
-
-                {"matrix": [6, 7], "x": 0, "y": 1.5},
-                {"matrix": [6, 5], "x": 1, "y": 1.5},
-                {"matrix": [7, 5], "x": 2, "y": 1.5},
-                {"matrix": [9, 5], "x": 3, "y": 1.5},
-                {"matrix": [8, 5], "x": 4, "y": 1.5},
-                {"matrix": [8, 7], "x": 5, "y": 1.5},
-                {"matrix": [10, 7], "x": 6, "y": 1.5},
-                {"matrix": [10, 5], "x": 7, "y": 1.5},
-                {"matrix": [11, 5], "x": 8, "y": 1.5},
-                {"matrix": [0, 5], "x": 9, "y": 1.5},
-                {"matrix": [2, 5], "x": 10, "y": 1.5},
-                {"matrix": [2, 7], "x": 11, "y": 1.5},
-                {"matrix": [11, 7], "x": 12, "y": 1.5},
-                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [16, 7], "x": 15.25, "y": 1.5},
-                {"matrix": [13, 7], "x": 16.25, "y": 1.5},
-                {"matrix": [12, 7], "x": 17.25, "y": 1.5},
-
-                {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [6, 3], "x": 1.5, "y": 2.5},
-                {"matrix": [7, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [9, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [8, 3], "x": 4.5, "y": 2.5},
-                {"matrix": [8, 6], "x": 5.5, "y": 2.5},
-                {"matrix": [10, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [10, 3], "x": 7.5, "y": 2.5},
-                {"matrix": [11, 3], "x": 8.5, "y": 2.5},
-                {"matrix": [0, 3], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 11.5, "y": 2.5},
-                {"matrix": [11, 6], "x": 12.5, "y": 2.5},
-                {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [15, 7], "x": 15.25, "y": 2.5},
-                {"matrix": [13, 5], "x": 16.25, "y": 2.5},
-                {"matrix": [12, 5], "x": 17.25, "y": 2.5},
-
-                {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [6, 4], "x": 1.75, "y": 3.5},
-                {"matrix": [7, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [9, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [8, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [8, 1], "x": 5.75, "y": 3.5},
-                {"matrix": [10, 1], "x": 6.75, "y": 3.5},
-                {"matrix": [10, 4], "x": 7.75, "y": 3.5},
-                {"matrix": [11, 4], "x": 8.75, "y": 3.5},
-                {"matrix": [0, 4], "x": 9.75, "y": 3.5},
-                {"matrix": [2, 4], "x": 10.75, "y": 3.5},
-                {"matrix": [2, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [7, 1], "x": 1.25, "y": 4.5},
-                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
-                {"matrix": [7, 0], "x": 3.25, "y": 4.5},
-                {"matrix": [9, 0], "x": 4.25, "y": 4.5},
-                {"matrix": [8, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [8, 2], "x": 6.25, "y": 4.5},
-                {"matrix": [10, 2], "x": 7.25, "y": 4.5},
-                {"matrix": [10, 0], "x": 8.25, "y": 4.5},
-                {"matrix": [11, 0], "x": 9.25, "y": 4.5},
-                {"matrix": [0, 0], "x": 10.25, "y": 4.5},
-                {"matrix": [2, 2], "x": 11.25, "y": 4.5},
-                {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [13, 1], "x": 16.25, "y": 4.5},
-
-                {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [13, 2], "x": 15.25, "y": 5.5},
-                {"matrix": [15, 2], "x": 16.25, "y": 5.5},
-                {"matrix": [16, 2], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bpiphany/hid_liber/keyboard.json b/keyboards/bpiphany/hid_liber/keyboard.json
new file mode 100644
index 00000000000..67c8416849f
--- /dev/null
+++ b/keyboards/bpiphany/hid_liber/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "HIDLiberation",
+    "manufacturer": "bpiphany",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB919",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "B5",
+        "scroll_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [6, 1], "x": 0, "y": 0},
+
+                {"matrix": [7, 7], "x": 2, "y": 0},
+                {"matrix": [9, 7], "x": 3, "y": 0},
+                {"matrix": [9, 6], "x": 4, "y": 0},
+                {"matrix": [9, 1], "x": 5, "y": 0},
+
+                {"matrix": [14, 5], "x": 6.5, "y": 0},
+                {"matrix": [11, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 5], "x": 12, "y": 0},
+                {"matrix": [3, 1], "x": 13, "y": 0},
+                {"matrix": [3, 2], "x": 14, "y": 0},
+
+                {"matrix": [1, 5], "x": 15.25, "y": 0},
+                {"matrix": [1, 3], "x": 16.25, "y": 0},
+                {"matrix": [14, 3], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 7], "x": 0, "y": 1.5},
+                {"matrix": [6, 5], "x": 1, "y": 1.5},
+                {"matrix": [7, 5], "x": 2, "y": 1.5},
+                {"matrix": [9, 5], "x": 3, "y": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 1.5},
+                {"matrix": [8, 7], "x": 5, "y": 1.5},
+                {"matrix": [10, 7], "x": 6, "y": 1.5},
+                {"matrix": [10, 5], "x": 7, "y": 1.5},
+                {"matrix": [11, 5], "x": 8, "y": 1.5},
+                {"matrix": [0, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [11, 7], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [16, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [13, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [12, 7], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [6, 3], "x": 1.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [9, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 4.5, "y": 2.5},
+                {"matrix": [8, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [10, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [10, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [11, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [11, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [15, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [13, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [12, 5], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [6, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [9, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [8, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [8, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [10, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [10, 4], "x": 7.75, "y": 3.5},
+                {"matrix": [11, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [2, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [2, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 3.25, "y": 4.5},
+                {"matrix": [9, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [8, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [11, 0], "x": 9.25, "y": 4.5},
+                {"matrix": [0, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [2, 2], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [13, 1], "x": 16.25, "y": 4.5},
+
+                {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [13, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [15, 2], "x": 16.25, "y": 5.5},
+                {"matrix": [16, 2], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
index fc98be5c123..3215e3588a3 100755
--- a/keyboards/bpiphany/hid_liber/rules.mk
+++ b/keyboards/bpiphany/hid_liber/rules.mk
@@ -1,16 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-CUSTOM_MATRIX = yes         # Custom matrix file
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-AUDIO_ENABLE = no           # Audio output
-
-# Project specific files
+CUSTOM_MATRIX = yes
 SRC = matrix.c
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 0d23223dc93..3b934626f3a 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
deleted file mode 100644
index 64a38a6e566..00000000000
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "keyboard_name": "Kitten Paw",
-  "manufacturer": "bpiphany",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x6050",
-    "device_version": "1.0.4"
-  },
-  "indicators": {
-    "caps_lock": "C6",
-    "num_lock": "B7",
-    "scroll_lock": "C5",
-    "on_state": 0
-  },
-  "processor": "atmega32u2",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["fullsize_ansi"],
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [6, 9], "x": 0, "y": 0},
-
-        {"matrix": [4, 8], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [2, 7], "x": 4, "y": 0},
-        {"matrix": [6, 7], "x": 5, "y": 0},
-
-        {"matrix": [7, 0], "x": 6.5, "y": 0},
-        {"matrix": [6, 4], "x": 7.5, "y": 0},
-        {"matrix": [2, 3], "x": 8.5, "y": 0},
-        {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 1], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [6, 1], "x": 13, "y": 0},
-        {"matrix": [0, 1], "x": 14, "y": 0},
-
-        {"matrix": [7, 2], "x": 15.25, "y": 0},
-        {"matrix": [5, 2], "x": 16.25, "y": 0},
-        {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 9], "x": 0, "y": 1.5},
-        {"matrix": [7, 9], "x": 1, "y": 1.5},
-        {"matrix": [7, 8], "x": 2, "y": 1.5},
-        {"matrix": [7, 7], "x": 3, "y": 1.5},
-        {"matrix": [7, 6], "x": 4, "y": 1.5},
-        {"matrix": [4, 6], "x": 5, "y": 1.5},
-        {"matrix": [4, 5], "x": 6, "y": 1.5},
-        {"matrix": [7, 5], "x": 7, "y": 1.5},
-        {"matrix": [7, 4], "x": 8, "y": 1.5},
-        {"matrix": [7, 3], "x": 9, "y": 1.5},
-        {"matrix": [7, 17], "x": 10, "y": 1.5},
-        {"matrix": [4, 17], "x": 11, "y": 1.5},
-        {"matrix": [4, 4], "x": 12, "y": 1.5},
-        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
-        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
-        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
-        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
-        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
-        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
-        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
-        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
-        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
-        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
-        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
-        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
-        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
-        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
-        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
-        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
-        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
-        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
-        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
-        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
-      ]
-    },
-    "LAYOUT_fullsize_ansi": {
-      "layout": [
-        {"matrix": [6, 9], "x": 0, "y": 0},
-
-        {"matrix": [4, 8], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [2, 7], "x": 4, "y": 0},
-        {"matrix": [6, 7], "x": 5, "y": 0},
-
-        {"matrix": [7, 0], "x": 6.5, "y": 0},
-        {"matrix": [6, 4], "x": 7.5, "y": 0},
-        {"matrix": [2, 3], "x": 8.5, "y": 0},
-        {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 1], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [6, 1], "x": 13, "y": 0},
-        {"matrix": [0, 1], "x": 14, "y": 0},
-
-        {"matrix": [7, 2], "x": 15.25, "y": 0},
-        {"matrix": [5, 2], "x": 16.25, "y": 0},
-        {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 9], "x": 0, "y": 1.5},
-        {"matrix": [7, 9], "x": 1, "y": 1.5},
-        {"matrix": [7, 8], "x": 2, "y": 1.5},
-        {"matrix": [7, 7], "x": 3, "y": 1.5},
-        {"matrix": [7, 6], "x": 4, "y": 1.5},
-        {"matrix": [4, 6], "x": 5, "y": 1.5},
-        {"matrix": [4, 5], "x": 6, "y": 1.5},
-        {"matrix": [7, 5], "x": 7, "y": 1.5},
-        {"matrix": [7, 4], "x": 8, "y": 1.5},
-        {"matrix": [7, 3], "x": 9, "y": 1.5},
-        {"matrix": [7, 17], "x": 10, "y": 1.5},
-        {"matrix": [4, 17], "x": 11, "y": 1.5},
-        {"matrix": [4, 4], "x": 12, "y": 1.5},
-        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
-        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
-        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
-        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
-        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
-        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
-        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
-        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
-        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
-        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
-        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
-        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
-        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
-        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
-        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
-        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
-        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
-        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
-        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/bpiphany/kitten_paw/keyboard.json b/keyboards/bpiphany/kitten_paw/keyboard.json
new file mode 100644
index 00000000000..829129d4063
--- /dev/null
+++ b/keyboards/bpiphany/kitten_paw/keyboard.json
@@ -0,0 +1,288 @@
+{
+  "keyboard_name": "Kitten Paw",
+  "manufacturer": "bpiphany",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6050",
+    "device_version": "1.0.4"
+  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "B7",
+    "scroll_lock": "C5",
+    "on_state": 0
+  },
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["fullsize_ansi"],
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    },
+    "LAYOUT_fullsize_ansi": {
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
index 43ebddd3574..8784813b335 100644
--- a/keyboards/bpiphany/kitten_paw/rules.mk
+++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/pegasushoof/2013/info.json
rename to keyboards/bpiphany/pegasushoof/2013/keyboard.json
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/pegasushoof/2015/info.json
rename to keyboards/bpiphany/pegasushoof/2015/keyboard.json
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index cb63e867fc7..c6817a89448 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
 #define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
deleted file mode 100644
index 659c6f3267a..00000000000
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "keyboard_name": "tiger_lily",
-  "manufacturer": "Bathroom Epiphanies",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4245",
-    "pid": "0x544C",
-    "device_version": "0.0.1"
-  },
-  "indicators": {
-    "caps_lock": "C6",
-    "num_lock": "C5",
-    "scroll_lock": "B7",
-    "on_state": 0
-  },
-  "processor": "atmega32u2",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["fullsize_ansi"],
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [6, 9], "x": 0, "y": 0},
-
-        {"matrix": [4, 8], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [2, 7], "x": 4, "y": 0},
-        {"matrix": [6, 7], "x": 5, "y": 0},
-
-        {"matrix": [7, 0], "x": 6.5, "y": 0},
-        {"matrix": [6, 4], "x": 7.5, "y": 0},
-        {"matrix": [2, 3], "x": 8.5, "y": 0},
-        {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 1], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [6, 1], "x": 13, "y": 0},
-        {"matrix": [0, 1], "x": 14, "y": 0},
-
-        {"matrix": [7, 2], "x": 15.25, "y": 0},
-        {"matrix": [5, 2], "x": 16.25, "y": 0},
-        {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 9], "x": 0, "y": 1.5},
-        {"matrix": [7, 9], "x": 1, "y": 1.5},
-        {"matrix": [7, 8], "x": 2, "y": 1.5},
-        {"matrix": [7, 7], "x": 3, "y": 1.5},
-        {"matrix": [7, 6], "x": 4, "y": 1.5},
-        {"matrix": [4, 6], "x": 5, "y": 1.5},
-        {"matrix": [4, 5], "x": 6, "y": 1.5},
-        {"matrix": [7, 5], "x": 7, "y": 1.5},
-        {"matrix": [7, 4], "x": 8, "y": 1.5},
-        {"matrix": [7, 3], "x": 9, "y": 1.5},
-        {"matrix": [7, 17], "x": 10, "y": 1.5},
-        {"matrix": [4, 17], "x": 11, "y": 1.5},
-        {"matrix": [4, 4], "x": 12, "y": 1.5},
-        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
-        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
-        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
-        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
-        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
-        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
-        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
-        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
-        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
-        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
-        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
-        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
-        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
-        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
-        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
-        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
-        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
-        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
-        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
-        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
-      ]
-    },
-    "LAYOUT_fullsize_ansi": {
-      "layout": [
-        {"matrix": [6, 9], "x": 0, "y": 0},
-
-        {"matrix": [4, 8], "x": 2, "y": 0},
-        {"matrix": [4, 7], "x": 3, "y": 0},
-        {"matrix": [2, 7], "x": 4, "y": 0},
-        {"matrix": [6, 7], "x": 5, "y": 0},
-
-        {"matrix": [7, 0], "x": 6.5, "y": 0},
-        {"matrix": [6, 4], "x": 7.5, "y": 0},
-        {"matrix": [2, 3], "x": 8.5, "y": 0},
-        {"matrix": [4, 3], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 1], "x": 11, "y": 0},
-        {"matrix": [7, 1], "x": 12, "y": 0},
-        {"matrix": [6, 1], "x": 13, "y": 0},
-        {"matrix": [0, 1], "x": 14, "y": 0},
-
-        {"matrix": [7, 2], "x": 15.25, "y": 0},
-        {"matrix": [5, 2], "x": 16.25, "y": 0},
-        {"matrix": [5, 0], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 9], "x": 0, "y": 1.5},
-        {"matrix": [7, 9], "x": 1, "y": 1.5},
-        {"matrix": [7, 8], "x": 2, "y": 1.5},
-        {"matrix": [7, 7], "x": 3, "y": 1.5},
-        {"matrix": [7, 6], "x": 4, "y": 1.5},
-        {"matrix": [4, 6], "x": 5, "y": 1.5},
-        {"matrix": [4, 5], "x": 6, "y": 1.5},
-        {"matrix": [7, 5], "x": 7, "y": 1.5},
-        {"matrix": [7, 4], "x": 8, "y": 1.5},
-        {"matrix": [7, 3], "x": 9, "y": 1.5},
-        {"matrix": [7, 17], "x": 10, "y": 1.5},
-        {"matrix": [4, 17], "x": 11, "y": 1.5},
-        {"matrix": [4, 4], "x": 12, "y": 1.5},
-        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
-        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
-        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
-        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
-        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
-        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
-        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
-        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
-        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
-        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
-        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
-        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
-        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
-        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
-        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
-        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
-        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
-        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
-        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
-        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
-        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
-        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
-        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
-        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
-        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
-        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
-        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
-        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/bpiphany/tiger_lily/keyboard.json b/keyboards/bpiphany/tiger_lily/keyboard.json
new file mode 100644
index 00000000000..118f89f39d0
--- /dev/null
+++ b/keyboards/bpiphany/tiger_lily/keyboard.json
@@ -0,0 +1,288 @@
+{
+  "keyboard_name": "tiger_lily",
+  "manufacturer": "Bathroom Epiphanies",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4245",
+    "pid": "0x544C",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "indicators": {
+    "caps_lock": "C6",
+    "num_lock": "C5",
+    "scroll_lock": "B7",
+    "on_state": 0
+  },
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["fullsize_ansi"],
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    },
+    "LAYOUT_fullsize_ansi": {
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
index 43ebddd3574..8784813b335 100644
--- a/keyboards/bpiphany/tiger_lily/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -1,14 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index af212673576..55322288ace 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
deleted file mode 100644
index 4ca48fee995..00000000000
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ /dev/null
@@ -1,338 +0,0 @@
-{
-  "keyboard_name": "Unloved Bastard",
-  "manufacturer": "Bathroom Epiphanies",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1337",
-    "device_version": "0.0.1"
-  },
-  "indicators": {
-    "caps_lock": "C5",
-    "num_lock": "B7",
-    "scroll_lock": "C6",
-    "on_state": 0
-  },
-  "processor": "atmega32u2",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["tkl_ansi", "tkl_iso"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
-  },
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [6, 6], "x": 0, "y": 0},
-
-        {"matrix": [4, 7], "x": 2, "y": 0},
-        {"matrix": [4, 8], "x": 3, "y": 0},
-        {"matrix": [2, 8], "x": 4, "y": 0},
-        {"matrix": [6, 8], "x": 5, "y": 0},
-
-        {"matrix": [5, 15], "x": 6.5, "y": 0},
-        {"matrix": [6, 11], "x": 7.5, "y": 0},
-        {"matrix": [2, 12], "x": 8.5, "y": 0},
-        {"matrix": [4, 12], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 14], "x": 11, "y": 0},
-        {"matrix": [5, 14], "x": 12, "y": 0},
-        {"matrix": [6, 14], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [5, 13], "x": 15.25, "y": 0},
-        {"matrix": [7, 13], "x": 16.25, "y": 0},
-        {"matrix": [7, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 6], "x": 0, "y": 1.5},
-        {"matrix": [5, 6], "x": 1, "y": 1.5},
-        {"matrix": [5, 7], "x": 2, "y": 1.5},
-        {"matrix": [5, 8], "x": 3, "y": 1.5},
-        {"matrix": [5, 9], "x": 4, "y": 1.5},
-        {"matrix": [4, 9], "x": 5, "y": 1.5},
-        {"matrix": [4, 10], "x": 6, "y": 1.5},
-        {"matrix": [5, 10], "x": 7, "y": 1.5},
-        {"matrix": [5, 11], "x": 8, "y": 1.5},
-        {"matrix": [5, 12], "x": 9, "y": 1.5},
-        {"matrix": [5, 5], "x": 10, "y": 1.5},
-        {"matrix": [4, 5], "x": 11, "y": 1.5},
-        {"matrix": [4, 11], "x": 12, "y": 1.5},
-        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
-        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
-        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
-        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
-        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
-        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
-        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
-        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
-        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
-        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
-        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
-      ]
-    },
-    "LAYOUT_tkl_iso": {
-      "layout": [
-        {"matrix": [6, 6], "x": 0, "y": 0},
-
-        {"matrix": [4, 7], "x": 2, "y": 0},
-        {"matrix": [4, 8], "x": 3, "y": 0},
-        {"matrix": [2, 8], "x": 4, "y": 0},
-        {"matrix": [6, 8], "x": 5, "y": 0},
-
-        {"matrix": [5, 15], "x": 6.5, "y": 0},
-        {"matrix": [6, 11], "x": 7.5, "y": 0},
-        {"matrix": [2, 12], "x": 8.5, "y": 0},
-        {"matrix": [4, 12], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 14], "x": 11, "y": 0},
-        {"matrix": [5, 14], "x": 12, "y": 0},
-        {"matrix": [6, 14], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [5, 13], "x": 15.25, "y": 0},
-        {"matrix": [7, 13], "x": 16.25, "y": 0},
-        {"matrix": [7, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 6], "x": 0, "y": 1.5},
-        {"matrix": [5, 6], "x": 1, "y": 1.5},
-        {"matrix": [5, 7], "x": 2, "y": 1.5},
-        {"matrix": [5, 8], "x": 3, "y": 1.5},
-        {"matrix": [5, 9], "x": 4, "y": 1.5},
-        {"matrix": [4, 9], "x": 5, "y": 1.5},
-        {"matrix": [4, 10], "x": 6, "y": 1.5},
-        {"matrix": [5, 10], "x": 7, "y": 1.5},
-        {"matrix": [5, 11], "x": 8, "y": 1.5},
-        {"matrix": [5, 12], "x": 9, "y": 1.5},
-        {"matrix": [5, 5], "x": 10, "y": 1.5},
-        {"matrix": [4, 5], "x": 11, "y": 1.5},
-        {"matrix": [4, 11], "x": 12, "y": 1.5},
-        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
-        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
-        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
-        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
-        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
-        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
-        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
-
-        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
-        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
-        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
-        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
-        {"matrix": [3, 14], "x": 12.75, "y": 3.5},
-        {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
-        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
-        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
-        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
-      ]
-    },
-    "LAYOUT_tkl_ansi": {
-      "layout": [
-        {"matrix": [6, 6], "x": 0, "y": 0},
-
-        {"matrix": [4, 7], "x": 2, "y": 0},
-        {"matrix": [4, 8], "x": 3, "y": 0},
-        {"matrix": [2, 8], "x": 4, "y": 0},
-        {"matrix": [6, 8], "x": 5, "y": 0},
-
-        {"matrix": [5, 15], "x": 6.5, "y": 0},
-        {"matrix": [6, 11], "x": 7.5, "y": 0},
-        {"matrix": [2, 12], "x": 8.5, "y": 0},
-        {"matrix": [4, 12], "x": 9.5, "y": 0},
-
-        {"matrix": [4, 14], "x": 11, "y": 0},
-        {"matrix": [5, 14], "x": 12, "y": 0},
-        {"matrix": [6, 14], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-
-        {"matrix": [5, 13], "x": 15.25, "y": 0},
-        {"matrix": [7, 13], "x": 16.25, "y": 0},
-        {"matrix": [7, 15], "x": 17.25, "y": 0},
-
-        {"matrix": [4, 6], "x": 0, "y": 1.5},
-        {"matrix": [5, 6], "x": 1, "y": 1.5},
-        {"matrix": [5, 7], "x": 2, "y": 1.5},
-        {"matrix": [5, 8], "x": 3, "y": 1.5},
-        {"matrix": [5, 9], "x": 4, "y": 1.5},
-        {"matrix": [4, 9], "x": 5, "y": 1.5},
-        {"matrix": [4, 10], "x": 6, "y": 1.5},
-        {"matrix": [5, 10], "x": 7, "y": 1.5},
-        {"matrix": [5, 11], "x": 8, "y": 1.5},
-        {"matrix": [5, 12], "x": 9, "y": 1.5},
-        {"matrix": [5, 5], "x": 10, "y": 1.5},
-        {"matrix": [4, 5], "x": 11, "y": 1.5},
-        {"matrix": [4, 11], "x": 12, "y": 1.5},
-        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
-        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
-        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
-        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
-        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
-        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
-        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
-        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
-        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
-        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
-        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
-        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
-        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
-        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
-        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
-        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
-        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
-        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
-        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
-        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
-        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
-        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
-        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
-        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
-        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
-        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
-        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
-        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
-        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
-        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
-        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
-        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
-        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
-
-        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
-        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
-        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
-        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
-        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
-        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
-        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
-        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
-        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
-        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
-        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
-        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
-        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
-        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
-        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
-        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
-        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
-        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
-        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
-        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
-        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/bpiphany/unloved_bastard/keyboard.json b/keyboards/bpiphany/unloved_bastard/keyboard.json
new file mode 100644
index 00000000000..4748057175e
--- /dev/null
+++ b/keyboards/bpiphany/unloved_bastard/keyboard.json
@@ -0,0 +1,352 @@
+{
+  "keyboard_name": "Unloved Bastard",
+  "manufacturer": "Bathroom Epiphanies",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1337",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "sleep_led": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "indicators": {
+    "caps_lock": "C5",
+    "num_lock": "B7",
+    "scroll_lock": "C6",
+    "on_state": 0
+  },
+  "processor": "atmega32u2",
+  "bootloader": "atmel-dfu",
+  "community_layouts": ["tkl_ansi", "tkl_iso"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_iso": {
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 14], "x": 12.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
+    },
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        {"matrix": [6, 6], "x": 0, "y": 0},
+
+        {"matrix": [4, 7], "x": 2, "y": 0},
+        {"matrix": [4, 8], "x": 3, "y": 0},
+        {"matrix": [2, 8], "x": 4, "y": 0},
+        {"matrix": [6, 8], "x": 5, "y": 0},
+
+        {"matrix": [5, 15], "x": 6.5, "y": 0},
+        {"matrix": [6, 11], "x": 7.5, "y": 0},
+        {"matrix": [2, 12], "x": 8.5, "y": 0},
+        {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 14], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [6, 14], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 0},
+        {"matrix": [7, 13], "x": 16.25, "y": 0},
+        {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 6], "x": 0, "y": 1.5},
+        {"matrix": [5, 6], "x": 1, "y": 1.5},
+        {"matrix": [5, 7], "x": 2, "y": 1.5},
+        {"matrix": [5, 8], "x": 3, "y": 1.5},
+        {"matrix": [5, 9], "x": 4, "y": 1.5},
+        {"matrix": [4, 9], "x": 5, "y": 1.5},
+        {"matrix": [4, 10], "x": 6, "y": 1.5},
+        {"matrix": [5, 10], "x": 7, "y": 1.5},
+        {"matrix": [5, 11], "x": 8, "y": 1.5},
+        {"matrix": [5, 12], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.5},
+        {"matrix": [4, 5], "x": 11, "y": 1.5},
+        {"matrix": [4, 11], "x": 12, "y": 1.5},
+        {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+        {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+        {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+        {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+        {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+        {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+        {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+        {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index 7a32c860327..8784813b335 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index b49e0a11cd5..d7ce751a649 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL 1
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define WS2812_SPI_DRIVER SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 5
 /*
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
deleted file mode 100644
index f89440f6955..00000000000
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "keyboard_name": "bt66tech 60%",
-    "manufacturer": "bt66tech",
-    "url": "",
-    "maintainer": "bt66tech",
-    "usb": {
-        "vid": "0x4254",
-        "pid": "0x7070",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "features": {
-        "backlight": true,
-        "bootmagic": false,
-        "command": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgblight": true,
-        "sleep_led": true
-    },
-    "matrix_pins": {
-        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],
-        "rows": ["B10", "B1", "B0", "A7", "A6"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "A8",
-        "levels": 6,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json
new file mode 100644
index 00000000000..26e4964d458
--- /dev/null
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "bt66tech 60%",
+    "manufacturer": "bt66tech",
+    "url": "",
+    "maintainer": "bt66tech",
+    "usb": {
+        "vid": "0x4254",
+        "pid": "0x7070",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "A8",
+        "levels": 6,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15",
+        "driver": "spi"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bt66tech/bt66tech60/rules.mk b/keyboards/bt66tech/bt66tech60/rules.mk
deleted file mode 100644
index cb9c90456cc..00000000000
--- a/keyboards/bt66tech/bt66tech60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = bt66tech/bt66tech60
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
deleted file mode 100644
index de1b75d0d66..00000000000
--- a/keyboards/bubble75/hotswap/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Velocifire
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c
index 30c908a79f0..fc10b0fc8ca 100644
--- a/keyboards/bubble75/hotswap/hotswap.c
+++ b/keyboards/bubble75/hotswap/hotswap.c
@@ -17,34 +17,6 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
-  {
-    /* Key Matrix to LED Index */
-    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, NO_LED, 13 },
-    { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
-    { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 },
-    { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, NO_LED, 44 },
-    { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, 71 },
-    { 80, 79, 78, NO_LED, NO_LED, 77, NO_LED, NO_LED, 76, 75, NO_LED, 74, NO_LED, 73, 72 }
-  }, {
-    /* LED Index to Physical Position */
-    // Switch LEDs
-    {0,0},     {23,0},    {38,0},    {54,0},    {69,0},    {75,0},    {90,0},    {105,0},   {120,0},  {143,0},  {158,0},  {173,0},  {188,0},            {225,0},
-    {225,18},  {203,18},  {180,18},  {165,18},  {150,18},  {135,18},  {120,18},  {105,18},  {90,18},  {75,18},  {60,18},  {45,18},  {30,18},  {15,18},  {0,18},
-    {4,30},    {19,30},   {34,30},   {49,30},   {64,30},   {79,30},   {84,30},   {99,30},   {114,30}, {129,30}, {144,30}, {159,30}, {174,30}, {219,30}, {225,30},
-    {225,41},     {201,41},    {191,41},    {161,41},  {146,41},  {131,41},  {116,41},  {101,41}, {86,41}, {71,41}, {56,41}, {41,41}, {26,41}, {6,41},
-    {13,52},   {34,52},   {49,52},   {64,52},   {79,52},   {94,52},   {109,52},  {124,52},  {139,52}, {154,52}, {169,52},       {189,52},     {210,52}, {225,52},
-    {225,64},  {210,64},  {195,64},      {186,64},    {167,64},                     {94,64},                           {39,64},         {21,64},        {2,64},
-  }, {
-    4,4,4,4,4,4,4,4,4,4,4,4,  4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-    4,4,4,4,4,4,4,4,4,4,4,4,4,  4,
-    4,4,4,4,4,4,4,4,4,4,4,4,  4,4,
-    4,4,4,    4,    4,4,  4,  4,4,
-  }
-};
-
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
         return false;
@@ -54,6 +26,4 @@ bool rgb_matrix_indicators_kb(void) {
     }
    return true;
 }
-
-
 #endif
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
deleted file mode 100644
index 99cfc4064e0..00000000000
--- a/keyboards/bubble75/hotswap/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "keyboard_name": "bubble75",
-    "url": "",
-    "manufacturer": "phl",
-    "maintainer": "velocifire",
-    "usb": {
-        "vid": "0x4242",
-        "pid": "0x5A4C",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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,
-            "raindrops": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 180
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0},
-                {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0},
-                {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0},
-                {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0},
-                {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0},
-                {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0},
-                {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0},
-
-                {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0},
-                {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0},
-                {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0},
-                {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0},
-
-                {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5},
-                {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5},
-
-                {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
-                {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5},
-                {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5},
-                {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/bubble75/hotswap/keyboard.json b/keyboards/bubble75/hotswap/keyboard.json
new file mode 100644
index 00000000000..011ce33ec40
--- /dev/null
+++ b/keyboards/bubble75/hotswap/keyboard.json
@@ -0,0 +1,247 @@
+{
+    "keyboard_name": "bubble75",
+    "url": "",
+    "manufacturer": "phl",
+    "maintainer": "velocifire",
+    "usb": {
+        "vid": "0x4242",
+        "pid": "0x5A4C",
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "no_startup_check": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 23, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 38, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 158, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 173, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 225, "y": 0, "flags": 4},
+            {"matrix": [1, 14], "x": 225, "y": 18, "flags": 4},
+            {"matrix": [1, 13], "x": 203, "y": 18, "flags": 4},
+            {"matrix": [1, 12], "x": 180, "y": 18, "flags": 4},
+            {"matrix": [1, 11], "x": 165, "y": 18, "flags": 4},
+            {"matrix": [1, 10], "x": 150, "y": 18, "flags": 4},
+            {"matrix": [1, 9], "x": 135, "y": 18, "flags": 4},
+            {"matrix": [1, 8], "x": 120, "y": 18, "flags": 4},
+            {"matrix": [1, 7], "x": 105, "y": 18, "flags": 4},
+            {"matrix": [1, 6], "x": 90, "y": 18, "flags": 4},
+            {"matrix": [1, 5], "x": 75, "y": 18, "flags": 4},
+            {"matrix": [1, 4], "x": 60, "y": 18, "flags": 4},
+            {"matrix": [1, 3], "x": 45, "y": 18, "flags": 4},
+            {"matrix": [1, 2], "x": 30, "y": 18, "flags": 4},
+            {"matrix": [1, 1], "x": 15, "y": 18, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+            {"matrix": [2, 0], "x": 4, "y": 30, "flags": 4},
+            {"matrix": [2, 1], "x": 19, "y": 30, "flags": 4},
+            {"matrix": [2, 2], "x": 34, "y": 30, "flags": 4},
+            {"matrix": [2, 3], "x": 49, "y": 30, "flags": 4},
+            {"matrix": [2, 4], "x": 64, "y": 30, "flags": 4},
+            {"matrix": [2, 5], "x": 79, "y": 30, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 30, "flags": 4},
+            {"matrix": [2, 7], "x": 99, "y": 30, "flags": 4},
+            {"matrix": [2, 8], "x": 114, "y": 30, "flags": 4},
+            {"matrix": [2, 9], "x": 129, "y": 30, "flags": 4},
+            {"matrix": [2, 10], "x": 144, "y": 30, "flags": 4},
+            {"matrix": [2, 11], "x": 159, "y": 30, "flags": 4},
+            {"matrix": [2, 12], "x": 174, "y": 30, "flags": 4},
+            {"matrix": [2, 13], "x": 219, "y": 30, "flags": 4},
+            {"matrix": [2, 14], "x": 225, "y": 30, "flags": 4},
+            {"matrix": [3, 14], "x": 225, "y": 41, "flags": 4},
+            {"matrix": [3, 12], "x": 201, "y": 41, "flags": 4},
+            {"matrix": [3, 11], "x": 191, "y": 41, "flags": 4},
+            {"matrix": [3, 10], "x": 161, "y": 41, "flags": 4},
+            {"matrix": [3, 9], "x": 146, "y": 41, "flags": 4},
+            {"matrix": [3, 8], "x": 131, "y": 41, "flags": 4},
+            {"matrix": [3, 7], "x": 116, "y": 41, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 41, "flags": 4},
+            {"matrix": [3, 5], "x": 86, "y": 41, "flags": 4},
+            {"matrix": [3, 4], "x": 71, "y": 41, "flags": 4},
+            {"matrix": [3, 3], "x": 56, "y": 41, "flags": 4},
+            {"matrix": [3, 2], "x": 41, "y": 41, "flags": 4},
+            {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
+            {"matrix": [3, 0], "x": 6, "y": 41, "flags": 4},
+            {"matrix": [4, 0], "x": 13, "y": 52, "flags": 4},
+            {"matrix": [4, 1], "x": 34, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 49, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 64, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 79, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 109, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 124, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 139, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 154, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 169, "y": 52, "flags": 4},
+            {"matrix": [4, 11], "x": 189, "y": 52, "flags": 4},
+            {"matrix": [4, 13], "x": 210, "y": 52, "flags": 4},
+            {"matrix": [4, 14], "x": 225, "y": 52, "flags": 4},
+            {"matrix": [5, 14], "x": 225, "y": 64, "flags": 4},
+            {"matrix": [5, 13], "x": 210, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 195, "y": 64, "flags": 4},
+            {"matrix": [5, 9], "x": 186, "y": 64, "flags": 4},
+            {"matrix": [5, 8], "x": 167, "y": 64, "flags": 4},
+            {"matrix": [5, 5], "x": 94, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 39, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 21, "y": 64, "flags": 4},
+            {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0},
+                {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0},
+                {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0},
+                {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0},
+
+                {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0},
+                {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0},
+                {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0},
+                {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0},
+
+                {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+                {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5},
+                {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
deleted file mode 100644
index c11ab0df94c..00000000000
--- a/keyboards/bubble75/hotswap/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-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
-AUDIO_ENABLE = no           # Audio output
-
-RGB_MATRIX_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
\ No newline at end of file
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
deleted file mode 100644
index 5903daa68d0..00000000000
--- a/keyboards/budgy/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "manufacturer": "KeyboardDweebs",
-    "keyboard_name": "budgy",
-    "maintainer": "doesntfazer",
-    "bootloader": "rp2040",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "processor": "RP2040",
-    "url": "",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0117",
-        "vid": "0xFABE"
-    },
-    "matrix_pins": {
-        "direct": [
-            ["GP6", "GP5", "GP4", "GP3", "GP2"],
-            ["GP11", "GP10", "GP9", "GP8", "GP7"],
-            ["GP15", "GP14", "GP13", "GP12", "GP16"],
-            ["GP17", "GP18", null, null, null]
-        ]
-    },
-    "split": {
-        "matrix_pins": {
-            "right": {
-                "direct": [
-                    ["GP2", "GP3", "GP4", "GP5", "GP6"],
-                    ["GP7", "GP8", "GP9", "GP10", "GP11"],
-                    ["GP16", "GP12", "GP13", "GP14", "GP15"],
-                    ["GP18", "GP17", null, null, null]
-                ]
-            }
-        }
-    },
-    "community_layouts": ["split_3x5_2"],
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [4, 0], "x": 8, "y": 0.25},
-                {"matrix": [4, 1], "x": 9, "y": 0.125},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 3], "x": 11, "y": 0.125},
-                {"matrix": [4, 4], "x": 12, "y": 0.25},
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [5, 0], "x": 8, "y": 1.25},
-                {"matrix": [5, 1], "x": 9, "y": 1.125},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 3], "x": 11, "y": 1.125},
-                {"matrix": [5, 4], "x": 12, "y": 1.25},
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [6, 0], "x": 8, "y": 2.25},
-                {"matrix": [6, 1], "x": 9, "y": 2.125},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2.125},
-                {"matrix": [6, 4], "x": 12, "y": 2.25},
-                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
-                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
-                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
-                {"matrix": [7, 1], "x": 8.5, "y": 3.5}
-           ]
-        }
-    }
-}
diff --git a/keyboards/budgy/keyboard.json b/keyboards/budgy/keyboard.json
new file mode 100644
index 00000000000..645336e8ad9
--- /dev/null
+++ b/keyboards/budgy/keyboard.json
@@ -0,0 +1,83 @@
+{
+    "manufacturer": "KeyboardDweebs",
+    "keyboard_name": "budgy",
+    "maintainer": "doesntfazer",
+    "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0117",
+        "vid": "0xFABE"
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP6", "GP5", "GP4", "GP3", "GP2"],
+            ["GP11", "GP10", "GP9", "GP8", "GP7"],
+            ["GP15", "GP14", "GP13", "GP12", "GP16"],
+            ["GP17", "GP18", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["GP2", "GP3", "GP4", "GP5", "GP6"],
+                    ["GP7", "GP8", "GP9", "GP10", "GP11"],
+                    ["GP16", "GP12", "GP13", "GP14", "GP15"],
+                    ["GP18", "GP17", null, null, null]
+                ]
+            }
+        }
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5}
+           ]
+        }
+    }
+}
diff --git a/keyboards/budgy/rules.mk b/keyboards/budgy/rules.mk
index 95546c6ef58..161ec22b16e 100644
--- a/keyboards/budgy/rules.mk
+++ b/keyboards/budgy/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = vendor
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
deleted file mode 100644
index 5b25baa8c4b..00000000000
--- a/keyboards/buildakb/potato65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/buildakb/potato65/keyboard.json b/keyboards/buildakb/potato65/keyboard.json
index 1aeba49bde2..db203531424 100644
--- a/keyboards/buildakb/potato65/keyboard.json
+++ b/keyboards/buildakb/potato65/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
         "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
deleted file mode 100644
index d60fc7af019..00000000000
--- a/keyboards/buildakb/potato65hs/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/buildakb/potato65hs/keyboard.json b/keyboards/buildakb/potato65hs/keyboard.json
index 61ecd61a150..9e5edd6adb4 100644
--- a/keyboards/buildakb/potato65hs/keyboard.json
+++ b/keyboards/buildakb/potato65hs/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
         "rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
deleted file mode 100644
index d60fc7af019..00000000000
--- a/keyboards/buildakb/potato65s/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/buildakb/potato65s/keyboard.json b/keyboards/buildakb/potato65s/keyboard.json
index 915f9674268..8dd9b6cc53c 100644
--- a/keyboards/buildakb/potato65s/keyboard.json
+++ b/keyboards/buildakb/potato65s/keyboard.json
@@ -39,6 +39,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
         "rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 36313a1c6a2..a040e92dfd5 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,11 +3,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #ifdef OLED_ENABLE
 #define OLED_DISPLAY_128X32
 #endif
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
deleted file mode 100644
index 0e7d246ae37..00000000000
--- a/keyboards/buzzard/rev1/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "Buzzard",
-    "manufacturer": "crehmann",
-    "url": "https://github.com/crehmann/buzzard",
-    "maintainer": "crehmann",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0xB077",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2",
-        "transport": {
-            "sync": {
-                "oled": true
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 4], "x": 1, "y": 0},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0},
-                {"matrix": [0, 0], "x": 5, "y": 0},
-
-                {"matrix": [4, 0], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0},
-                {"matrix": [4, 2], "x": 13, "y": 0},
-                {"matrix": [4, 3], "x": 14, "y": 0},
-                {"matrix": [4, 4], "x": 15, "y": 0},
-
-                {"matrix": [1, 5], "x": 0, "y": 1},
-                {"matrix": [1, 4], "x": 1, "y": 1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1},
-                {"matrix": [1, 0], "x": 5, "y": 1},
-
-                {"matrix": [5, 0], "x": 11, "y": 1},
-                {"matrix": [5, 1], "x": 12, "y": 1},
-                {"matrix": [5, 2], "x": 13, "y": 1},
-                {"matrix": [5, 3], "x": 14, "y": 1},
-                {"matrix": [5, 4], "x": 15, "y": 1},
-                {"matrix": [5, 5], "x": 16, "y": 1},
-
-                {"matrix": [2, 5], "x": 0, "y": 2},
-                {"matrix": [2, 4], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 0], "x": 5, "y": 2},
-
-                {"matrix": [6, 0], "x": 11, "y": 2},
-                {"matrix": [6, 1], "x": 12, "y": 2},
-                {"matrix": [6, 2], "x": 13, "y": 2},
-                {"matrix": [6, 3], "x": 14, "y": 2},
-                {"matrix": [6, 4], "x": 15, "y": 2},
-                {"matrix": [6, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 5, "y": 3},
-                {"matrix": [3, 1], "x": 6, "y": 3},
-                {"matrix": [3, 0], "x": 7, "y": 3},
-
-                {"matrix": [7, 0], "x": 9, "y": 3},
-                {"matrix": [7, 1], "x": 10, "y": 3},
-                {"matrix": [7, 2], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/buzzard/rev1/keyboard.json b/keyboards/buzzard/rev1/keyboard.json
new file mode 100644
index 00000000000..dd17a82754b
--- /dev/null
+++ b/keyboards/buzzard/rev1/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Buzzard",
+    "manufacturer": "crehmann",
+    "url": "https://github.com/crehmann/buzzard",
+    "maintainer": "crehmann",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB077",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "ps2": true
+    },
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "oled": true
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 11, "y": 0},
+                {"matrix": [4, 1], "x": 12, "y": 0},
+                {"matrix": [4, 2], "x": 13, "y": 0},
+                {"matrix": [4, 3], "x": 14, "y": 0},
+                {"matrix": [4, 4], "x": 15, "y": 0},
+
+                {"matrix": [1, 5], "x": 0, "y": 1},
+                {"matrix": [1, 4], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 11, "y": 1},
+                {"matrix": [5, 1], "x": 12, "y": 1},
+                {"matrix": [5, 2], "x": 13, "y": 1},
+                {"matrix": [5, 3], "x": 14, "y": 1},
+                {"matrix": [5, 4], "x": 15, "y": 1},
+                {"matrix": [5, 5], "x": 16, "y": 1},
+
+                {"matrix": [2, 5], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+
+                {"matrix": [6, 0], "x": 11, "y": 2},
+                {"matrix": [6, 1], "x": 12, "y": 2},
+                {"matrix": [6, 2], "x": 13, "y": 2},
+                {"matrix": [6, 3], "x": 14, "y": 2},
+                {"matrix": [6, 4], "x": 15, "y": 2},
+                {"matrix": [6, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+                {"matrix": [3, 0], "x": 7, "y": 3},
+
+                {"matrix": [7, 0], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 2beb545ece1..848877e3751 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,2 +1 @@
-PS2_ENABLE = yes
 PS2_DRIVER = interrupt
diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk
index c0b4e9943d2..2f66720b774 100644
--- a/keyboards/buzzard/rules.mk
+++ b/keyboards/buzzard/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = buzzard/rev1
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/v1/keyboard.json
similarity index 100%
rename from keyboards/canary/canary60rgb/info.json
rename to keyboards/canary/canary60rgb/v1/keyboard.json
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/v1/v1.c
similarity index 100%
rename from keyboards/canary/canary60rgb/canary60rgb.c
rename to keyboards/canary/canary60rgb/v1/v1.c
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json
index 0cab7223380..54679d57921 100644
--- a/keyboards/cannonkeys/aella/info.json
+++ b/keyboards/cannonkeys/aella/info.json
@@ -15,6 +15,14 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk
index 480e8661799..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/aella/rules.mk
+++ b/keyboards/cannonkeys/aella/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index 9de1ff5fff6..e1e18f51670 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8d3de1b8b23..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index 9565795169c..c7ecea37f8e 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -28,6 +28,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "encoder": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk
index 5afdd3772f5..04fe1eba2ac 100644
--- a/keyboards/cannonkeys/balance/rules.mk
+++ b/keyboards/cannonkeys/balance/rules.mk
@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 0eddf11aaa5..4cff1a7571f 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -19,6 +19,14 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": [
         "65_ansi_blocker",
         "65_ansi_blocker_split_bs",
diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk
index 480e8661799..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/brutalv2_65/rules.mk
+++ b/keyboards/cannonkeys/brutalv2_65/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index d1bbce929a1..ac1bca976b1 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -44,6 +44,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "community_layouts": [
         "tkl_f13_ansi_tsangan",
         "tkl_f13_ansi_tsangan_split_bs_rshift",
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index a8468b3ed33..f61d0e12e5b 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -24,6 +24,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT"
     },
diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk
index a5906b6a90f..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/crin/rules.mk
+++ b/keyboards/cannonkeys/crin/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 112ebaddde7..0c437ed921f 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -36,5 +36,15 @@
         "driver": "spi"
     },
     "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    }
 }
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 023b329ad22..60addd7fe72 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -1,17 +1,4 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes   # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = yes    # Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
 DEFAULT_FOLDER = cannonkeys/db60/rev2
-
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index a3b269f1cfe..7acea3fe8b1 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "community_layouts": [
         "tkl_f13_ansi",
         "tkl_f13_ansi_split_bs_rshift",
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 8d3de1b8b23..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index a371ae42320..3d8a4acac93 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -19,6 +19,14 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": [
         "65_ansi",
         "65_ansi_split_bs",
diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk
index 480e8661799..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/gentoo/rules.mk
+++ b/keyboards/cannonkeys/gentoo/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index ef496628dac..fa97ae58772 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -19,6 +19,14 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "layout_aliases": {
         "LAYOUT_default": "LAYOUT_65_ansi_rwkl"
     },
diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk
index 4ee7a29916a..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/gentoo_hs/rules.mk
+++ b/keyboards/cannonkeys/gentoo_hs/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 355ae99f0c9..bca90e50157 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "community_layouts": ["60_ansi", "60_tsangan_hhkb"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 8d3de1b8b23..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index 3c447a4bd3e..63e84be0aa4 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
index 49aaaddd525..3f5e92a99c9 100644
--- a/keyboards/cannonkeys/is0gr/info.json
+++ b/keyboards/cannonkeys/is0gr/info.json
@@ -18,8 +18,8 @@
     "url": "https://cannonkeys.com",
     "usb": {
         "device_version": "0.0.1",
-        "pid": "0x0028",
-        "vid": "0xCA04"
+        "pid": "0xCA04",
+        "vid": "0x0028"
     },
     "community_layouts": ["ortho_1x1"],
     "layouts": {
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
index e148ae468a6..6f76582e4b2 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -4,6 +4,9 @@
 #include "satisfaction_core.h"
 #include "print.h"
 #include "debug.h"
+#include "matrix.h"
+#include "quantum.h"
+#include "encoder.h"
 
 #include <ch.h>
 #include <hal.h>
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
index 9c466421952..70ee2a3fdaf 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "via.h" // only for EEPROM address
 #include "satisfaction_keycodes.h"
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
index 7122091ea3c..aab005ebd87 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
@@ -3,6 +3,9 @@
 
 #include "satisfaction_core.h"
 #include "eeprom.h"
+#ifdef BACKLIGHT_ENABLE
+#    include "backlight.h"
+#endif
 
 void pre_encoder_mode_change(void){
   if(encoder_mode == ENC_MODE_CLOCK_SET){
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
index 18ae368e535..0361453c52b 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
@@ -2,6 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "satisfaction_core.h"
+#include "action_layer.h"
+#include "action_util.h"
+#include "timer.h"
+#include "matrix.h"
+#include "led.h"
+#include "host.h"
+#include "oled_driver.h"
+#include "progmem.h"
 #include <stdio.h>
 
 void draw_default(void);
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index d5941f5f969..3897aea08b9 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -45,6 +45,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/malicious_ergo/rules.mk
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index d831eb1aca5..19227c51507 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json
index 8be4673df4b..5ae7039049a 100644
--- a/keyboards/cannonkeys/onyx/info.json
+++ b/keyboards/cannonkeys/onyx/info.json
@@ -20,6 +20,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk
index a5906b6a90f..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/onyx/rules.mk
+++ b/keyboards/cannonkeys/onyx/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/practice60/info.json
rename to keyboards/cannonkeys/practice60/keyboard.json
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
deleted file mode 100644
index 5f7d5fe26d3..00000000000
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = cannonkeys/practice60
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json
index 889ff5eff92..f9a58afa020 100644
--- a/keyboards/cannonkeys/rekt1800/info.json
+++ b/keyboards/cannonkeys/rekt1800/info.json
@@ -20,6 +20,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk
index 01d0c0ade11..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/keyboards/cannonkeys/rekt1800/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
-
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index d9236b39056..876c68e82e2 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -44,6 +44,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/sagittarius/rules.mk
+++ b/keyboards/cannonkeys/sagittarius/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 0c2409713b9..9d7d454e550 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"],
     "layouts": {
         "LAYOUT_default": {
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8d3de1b8b23..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index ed834c73cd9..acc5093221d 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 8d3de1b8b23..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index 3542bca1f6b..a874d3d2935 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -39,6 +39,16 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index 86794ca0f70..0ab54aaaf71 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json
index d6669155cfc..b2d68545f0b 100644
--- a/keyboards/cannonkeys/vicious40/info.json
+++ b/keyboards/cannonkeys/vicious40/info.json
@@ -20,6 +20,15 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk
index 9d14eaf9aa0..04fe1eba2ac 100644
--- a/keyboards/cannonkeys/vicious40/rules.mk
+++ b/keyboards/cannonkeys/vicious40/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
index fdc90871429..e401b2ce972 100644
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@@ -28,6 +28,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "bootmagic": {
             "matrix": [4, 5]
         },
diff --git a/keyboards/cantor/rules.mk b/keyboards/cantor/rules.mk
index 6bd8b9bf770..c6e29883213 100644
--- a/keyboards/cantor/rules.mk
+++ b/keyboards/cantor/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index 280ab8bd7e4..c190bd84d71 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -10,6 +10,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "unicode": true
+    },
     "community_layouts": ["split_3x5_3", "split_3x6_3"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x6_3"
diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c
index 0218adf39b4..387d31ee076 100644
--- a/keyboards/centromere/matrix.c
+++ b/keyboards/centromere/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index 26081e41321..0bb4817a8bd 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -1,19 +1,6 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
 
 # project specific files
diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json
index 5bd7c644cff..43565b98529 100644
--- a/keyboards/checkerboards/phoenix45_ortho/info.json
+++ b/keyboards/checkerboards/phoenix45_ortho/info.json
@@ -20,6 +20,15 @@
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "unicode": true,
+        "encoder": true
+    },
     "layouts": {
         "LAYOUT_ortho_2x225u": {
             "layout": [
diff --git a/keyboards/checkerboards/phoenix45_ortho/rules.mk b/keyboards/checkerboards/phoenix45_ortho/rules.mk
index 634fd79c1de..4df55cd2206 100644
--- a/keyboards/checkerboards/phoenix45_ortho/rules.mk
+++ b/keyboards/checkerboards/phoenix45_ortho/rules.mk
@@ -1,17 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-ENCODER_ENABLE = yes	    # Encoder enable
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json
index ca844603484..22fa758e7ed 100644
--- a/keyboards/checkerboards/quark/info.json
+++ b/keyboards/checkerboards/quark/info.json
@@ -41,6 +41,16 @@
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "unicode": true,
+        "encoder": true
+    },
     "community_layouts": ["ortho_4x12", "planck_mit"],
     "layouts": {
         "LAYOUT_ortho_5x12_2x225u": {
diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk
index 2dd2e10d801..4df55cd2206 100644
--- a/keyboards/checkerboards/quark/rules.mk
+++ b/keyboards/checkerboards/quark/rules.mk
@@ -1,19 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-ENCODER_ENABLE = yes	    # Enable Rotary Encoders
-
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index a47253d5b4a..e242bfc5d9a 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -41,6 +41,16 @@
     },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "unicode": true,
+        "encoder": true
+    },
     "layouts": {
         "LAYOUT_4_2x225u": {
             "layout": [
diff --git a/keyboards/checkerboards/quark_squared/rules.mk b/keyboards/checkerboards/quark_squared/rules.mk
index 88b0022c5fd..4df55cd2206 100644
--- a/keyboards/checkerboards/quark_squared/rules.mk
+++ b/keyboards/checkerboards/quark_squared/rules.mk
@@ -1,17 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes        # Unicode
-ENCODER_ENABLE = yes 		# Enable Rotary Encoders
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json
deleted file mode 100644
index f88186faddc..00000000000
--- a/keyboards/checkerboards/snop60/info.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "keyboard_name": "SNOP60",
-    "manufacturer": "Nasp",
-    "url": "www.checkerboards.xyz",
-    "maintainer": "nasp",
-    "usb": {
-        "vid": "0x7070",
-        "pid": "0x2416",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "C6", "C7", "D5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "E6", "D4", "D7"],
-        "rows": ["B7", "D0", "D6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D3"}
-        ]
-    },
-    "backlight": {
-        "driver": "timer",
-        "pin": "D1",
-        "levels": 6,
-        "breathing": true
-    },
-    "rgblight": {
-        "hue_steps": 12,
-        "saturation_steps": 12,
-        "brightness_steps": 12,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
-        "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space"
-    },
-    "layouts": {
-        "LAYOUT_60_ansi_tsangan_split_bs_rshift_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, "y": 0},
-                {"matrix": [4, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
-                {"matrix": [4, 6], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 12.5, "y": 4},
-                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan_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": [4, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 12.5, "y": 4},
-                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/checkerboards/snop60/keyboard.json b/keyboards/checkerboards/snop60/keyboard.json
new file mode 100644
index 00000000000..60b22caf76a
--- /dev/null
+++ b/keyboards/checkerboards/snop60/keyboard.json
@@ -0,0 +1,211 @@
+{
+    "keyboard_name": "SNOP60",
+    "manufacturer": "Nasp",
+    "url": "www.checkerboards.xyz",
+    "maintainer": "nasp",
+    "usb": {
+        "vid": "0x7070",
+        "pid": "0x2416",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D5", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "E6", "D4", "D7"],
+        "rows": ["B7", "D0", "D6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D3"}
+        ]
+    },
+    "backlight": {
+        "driver": "timer",
+        "pin": "D1",
+        "levels": 6,
+        "breathing": true
+    },
+    "rgblight": {
+        "hue_steps": 12,
+        "saturation_steps": 12,
+        "brightness_steps": 12,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layout_aliases": {
+        "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
+        "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan_split_bs_rshift_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, "y": 0},
+                {"matrix": [4, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan_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": [4, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk
deleted file mode 100644
index d24c9861b4d..00000000000
--- a/keyboards/checkerboards/snop60/rules.mk
+++ /dev/null
@@ -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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENBALE = yes	    # Enable Rotary Encoders
diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
deleted file mode 100644
index 89fdd4baa12..00000000000
--- a/keyboards/chlx/str_merro60/info.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-    "keyboard_name": "str.merro60",
-    "manufacturer": "chlx bsmt",
-    "url": "www.github.com/gaclee3b",
-    "maintainer": "gaclee3b",
-    "usb": {
-        "vid": "0x4358",
-        "pid": "0x0602",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "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"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
-        "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_default": "LAYOUT_all",
-        "LAYOUT_hhkb": "LAYOUT_60_hhkb",
-        "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift",
-        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [9, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"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": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "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": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_split_bs_rshift": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [9, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [9, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [9, 0], "x": 1.5, "y": 4},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
-                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [9, 5], "x": 12.5, "y": 4}
-            ]
-        },
-        "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": [1, 6], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 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": [6, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_split_bs_rshift": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [9, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 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": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [9, 6], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [9, 0], "x": 1.5, "y": 4},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
-                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [9, 5], "x": 12.5, "y": 4},
-                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/chlx/str_merro60/keyboard.json b/keyboards/chlx/str_merro60/keyboard.json
new file mode 100644
index 00000000000..15903f2f6cb
--- /dev/null
+++ b/keyboards/chlx/str_merro60/keyboard.json
@@ -0,0 +1,548 @@
+{
+    "keyboard_name": "str.merro60",
+    "manufacturer": "chlx bsmt",
+    "url": "www.github.com/gaclee3b",
+    "maintainer": "gaclee3b",
+    "usb": {
+        "vid": "0x4358",
+        "pid": "0x0602",
+        "device_version": "1.0.0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "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"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
+        "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_all",
+        "LAYOUT_hhkb": "LAYOUT_60_hhkb",
+        "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift",
+        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_all": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"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": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "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": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 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": [6, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 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": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [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": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk
deleted file mode 100644
index 9cceab1f746..00000000000
--- a/keyboards/chlx/str_merro60/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb
diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c
index 2225d6da63d..d9ba1975893 100644
--- a/keyboards/cipulot/common/ec_board.c
+++ b/keyboards/cipulot/common/ec_board.c
@@ -15,7 +15,7 @@
  */
 
 #include "ec_switch_matrix.h"
-#include "quantum.h"
+#include "keyboard.h"
 
 void eeconfig_init_kb(void) {
     // Default values
diff --git a/keyboards/cipulot/ec_typek/config.h b/keyboards/cipulot/ec_typek/config.h
new file mode 100644
index 00000000000..a6619c600c8
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/config.h
@@ -0,0 +1,81 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B14, B13, B12, A6, A7 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B9, B8 }
+
+#define AMUX_SEL_PINS \
+    { B7, B6, B5 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 7, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A1
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 171
+
+// RGB & Indicators
+// PWM driver with direct memory access (DMA) support
+#define WS2812_PWM_COMPLEMENTARY_OUTPUT
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
+#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP
+
+#define RGBLIGHT_DEFAULT_VAL 200
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
+
+#define NUM_INDICATOR_INDEX 2
+#define CAPS_INDICATOR_INDEX 1
+#define SCROLL_INDICATOR_INDEX 0
diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.c b/keyboards/cipulot/ec_typek/ec_switch_matrix.c
new file mode 100644
index 00000000000..da58a75bbcf
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.c
@@ -0,0 +1,318 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "math.h"
+#include "print.h"
+#include "wait.h"
+
+#if defined(__AVR__)
+#    error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results."
+#endif
+
+#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN)
+
+eeprom_ec_config_t eeprom_ec_config;
+ec_config_t        ec_config;
+
+// Pin and port array
+const pin_t row_pins[]                                 = MATRIX_ROW_PINS;
+const pin_t amux_sel_pins[]                            = AMUX_SEL_PINS;
+const pin_t amux_en_pins[]                             = AMUX_EN_PINS;
+const pin_t amux_n_col_sizes[]                         = AMUX_COL_CHANNELS_SIZES;
+const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS};
+
+#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins)
+#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT)
+// Checks for the correctness of the configuration
+_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available");
+// Check that number of select pins is enough to select all the channels
+_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels");
+// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available
+_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available");
+// static ec_config_t config;
+static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+// Initialize the row pins
+void init_row(void) {
+    // Set all row pins as output and low
+    for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) {
+        gpio_set_pin_output(row_pins[idx]);
+        gpio_write_pin_low(row_pins[idx]);
+    }
+}
+
+// Initialize the multiplexers
+void init_amux(void) {
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        gpio_set_pin_output(amux_en_pins[idx]);
+        gpio_write_pin_low(amux_en_pins[idx]);
+    }
+    for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) {
+        gpio_set_pin_output(amux_sel_pins[idx]);
+    }
+}
+
+// Select the multiplexer channel of the specified multiplexer
+void select_amux_channel(uint8_t channel, uint8_t col) {
+    // Get the channel for the specified multiplexer
+    uint8_t ch = amux_n_col_channels[channel][col];
+    // momentarily disable specified multiplexer
+    gpio_write_pin_high(amux_en_pins[channel]);
+    // Select the multiplexer channel
+    for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) {
+        gpio_write_pin(amux_sel_pins[i], ch & (1 << i));
+    }
+    // re enable specified multiplexer
+    gpio_write_pin_low(amux_en_pins[channel]);
+}
+
+// Disable all the unused multiplexers
+void disable_unused_amux(uint8_t channel) {
+    // disable all the other multiplexers apart from the current selected one
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        if (idx != channel) {
+            gpio_write_pin_high(amux_en_pins[idx]);
+        }
+    }
+}
+// Discharge the peak hold capacitor
+void discharge_capacitor(void) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_low(DISCHARGE_PIN);
+#else
+    gpio_write_pin_low(DISCHARGE_PIN);
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+}
+
+// Charge the peak hold capacitor
+void charge_capacitor(uint8_t row) {
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_write_pin_high(DISCHARGE_PIN);
+#else
+    gpio_set_pin_input(DISCHARGE_PIN);
+#endif
+    gpio_write_pin_high(row_pins[row]);
+}
+
+// Initialize the peripherals pins
+int ec_init(void) {
+    // Initialize ADC
+    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+    adcMux = pinToMux(ANALOG_PORT);
+
+    // Dummy call to make sure that adcStart() has been called in the appropriate state
+    adc_read(adcMux);
+
+    // Initialize discharge pin as discharge mode
+    gpio_write_pin_low(DISCHARGE_PIN);
+#ifdef OPEN_DRAIN_SUPPORT
+    gpio_set_pin_output_open_drain(DISCHARGE_PIN);
+#else
+    gpio_set_pin_output(DISCHARGE_PIN);
+#endif
+
+    // Initialize drive lines
+    init_row();
+
+    // Initialize AMUXs
+    init_amux();
+
+    return 0;
+}
+
+// Get the noise floor
+void ec_noise_floor(void) {
+    // Initialize the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] = 0;
+        }
+    }
+
+    // Sample the noise floor
+    for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) {
+        for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+            disable_unused_amux(amux);
+            for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col = col + sum;
+                for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                    ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col);
+                }
+            }
+        }
+        wait_ms(5);
+    }
+
+    // Average the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT;
+        }
+    }
+}
+
+// Scan key values and update matrix state
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+        disable_unused_amux(amux);
+        for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col        = col + sum;
+                sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col);
+
+                if (ec_config.bottoming_calibration) {
+                    if (ec_config.bottoming_calibration_starter[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col]             = sw_value[row][adjusted_col];
+                        ec_config.bottoming_calibration_starter[row][adjusted_col] = false;
+                    } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col];
+                    }
+                } else {
+                    updated |= ec_update_key(&current_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]);
+                }
+            }
+        }
+    }
+
+    return ec_config.bottoming_calibration ? false : updated;
+}
+
+// Read the capacitive sensor value
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+    uint16_t sw_value = 0;
+
+    // Select the multiplexer
+    select_amux_channel(channel, col);
+
+    // Set the row pin to low state to avoid ghosting
+    gpio_write_pin_low(row_pins[row]);
+
+    ATOMIC_BLOCK_FORCEON {
+        // Set the row pin to high state and have capacitor charge
+        charge_capacitor(row);
+        // Read the ADC value
+        sw_value = adc_read(adcMux);
+    }
+    // Discharge peak hold capacitor
+    discharge_capacitor();
+    // Waiting for the ghost capacitor to discharge fully
+    wait_us(DISCHARGE_TIME);
+
+    return sw_value;
+}
+
+// Update press/release state of key
+bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // Real Time Noise Floor Calibration
+    if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) {
+        uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value);
+        ec_config.noise_floor[row][col]                             = sw_value;
+        ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+    }
+
+    // Normal board-wide APC
+    if (ec_config.actuation_mode == 0) {
+        if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) {
+            *current_row &= ~(1 << col);
+            uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+        if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) {
+            *current_row |= (1 << col);
+            uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+    }
+    // Rapid Trigger
+    else if (ec_config.actuation_mode == 1) {
+        // Is key in active zone?
+        if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) {
+            // Is key pressed while in active zone?
+            if (current_state) {
+                // Is the key still moving down?
+                if (sw_value > ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                }
+                // Has key moved up enough to be released?
+                else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row &= ~(1 << col);
+                    uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+            // Key is not pressed while in active zone
+            else {
+                // Is the key still moving up?
+                if (sw_value < ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                }
+                // Has key moved down enough to be pressed?
+                else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row |= (1 << col);
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+        }
+        // Key is not in active zone
+        else {
+            // Check to avoid key being stuck in pressed state near the active zone threshold
+            if (sw_value < ec_config.extremum[row][col]) {
+                ec_config.extremum[row][col] = sw_value;
+                *current_row &= ~(1 << col);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Print the matrix values
+void ec_print_matrix(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", sw_value[row][col]);
+        }
+        uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Rescale the value to a different range
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) {
+    return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.h b/keyboards/cipulot/ec_typek/ec_switch_matrix.h
new file mode 100644
index 00000000000..fad20360bc7
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.h
@@ -0,0 +1,84 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+#include "eeconfig.h"
+#include "util.h"
+
+typedef struct _indicator_config_t {
+    uint8_t h;
+    uint8_t s;
+    uint8_t v;
+    bool    enabled;
+} indicator_config;
+
+typedef struct PACKED {
+    indicator_config num;
+    indicator_config caps;
+    indicator_config scroll;
+    uint8_t          actuation_mode;                              // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
+    uint16_t         mode_0_actuation_threshold;                  // threshold for key press in mode 0
+    uint16_t         mode_0_release_threshold;                    // threshold for key release in mode 0
+    uint16_t         mode_1_initial_deadzone_offset;              // threshold for key press in mode 1
+    uint8_t          mode_1_actuation_offset;                // offset for key press in mode 1 and 2 (1-255)
+    uint8_t          mode_1_release_offset;                  // offset for key release in mode 1 and 2 (1-255)
+    uint16_t         bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading
+} eeprom_ec_config_t;
+
+typedef struct {
+    uint8_t  actuation_mode;                                                    // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel")
+    uint16_t mode_0_actuation_threshold;                                        // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                                          // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;                                    // threshold for key press in mode 1 (initial deadzone)
+    uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS];     // threshold for key press in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS];       // threshold for key release in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale
+    uint8_t  mode_1_actuation_offset;                                      // offset for key press in mode 1 (1-255)
+    uint8_t  mode_1_release_offset;                                        // offset for key release in mode 1 (1-255)
+    uint16_t extremum[MATRIX_ROWS][MATRIX_COLS];                                // extremum values for mode 1
+    uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS];                             // noise floor detected during startup
+    bool     bottoming_calibration;                                             // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    bool     bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS];           // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS];                       // bottoming reading
+} ec_config_t;
+
+// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t
+_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
+
+extern eeprom_ec_config_t eeprom_ec_config;
+
+extern ec_config_t ec_config;
+
+void init_row(void);
+void init_amux(void);
+void select_amux_channel(uint8_t channel, uint8_t col);
+void disable_unused_amux(uint8_t channel);
+void discharge_capacitor(void);
+void charge_capacitor(uint8_t row);
+
+int      ec_init(void);
+void     ec_noise_floor(void);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool     ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void     ec_print_matrix(void);
+
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
+bool indicators_callback(void);
diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c
new file mode 100644
index 00000000000..7c3874d6b3f
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/ec_typek.c
@@ -0,0 +1,119 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+    // Default values
+    eeprom_ec_config.num.h                          = 0;
+    eeprom_ec_config.num.s                          = 0;
+    eeprom_ec_config.num.v                          = 60;
+    eeprom_ec_config.num.enabled                    = true;
+    eeprom_ec_config.caps.h                         = 0;
+    eeprom_ec_config.caps.s                         = 0;
+    eeprom_ec_config.caps.v                         = 60;
+    eeprom_ec_config.caps.enabled                   = true;
+    eeprom_ec_config.scroll.h                       = 0;
+    eeprom_ec_config.scroll.s                       = 0;
+    eeprom_ec_config.scroll.v                       = 60;
+    eeprom_ec_config.scroll.enabled                 = true;
+    eeprom_ec_config.actuation_mode                 = DEFAULT_ACTUATION_MODE;
+    eeprom_ec_config.mode_0_actuation_threshold     = DEFAULT_MODE_0_ACTUATION_LEVEL;
+    eeprom_ec_config.mode_0_release_threshold       = DEFAULT_MODE_0_RELEASE_LEVEL;
+    eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET;
+    eeprom_ec_config.mode_1_actuation_offset   = DEFAULT_MODE_1_ACTUATION_OFFSET;
+    eeprom_ec_config.mode_1_release_offset     = DEFAULT_MODE_1_RELEASE_OFFSET;
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING;
+        }
+    }
+    // Write default value to EEPROM now
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+
+    eeconfig_init_user();
+}
+
+// On Keyboard startup
+void keyboard_post_init_kb(void) {
+    // Read custom menu variables from memory
+    eeconfig_read_kb_datablock(&eeprom_ec_config);
+
+    // Set runtime values to EEPROM values
+    ec_config.actuation_mode                 = eeprom_ec_config.actuation_mode;
+    ec_config.mode_0_actuation_threshold     = eeprom_ec_config.mode_0_actuation_threshold;
+    ec_config.mode_0_release_threshold       = eeprom_ec_config.mode_0_release_threshold;
+    ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset;
+    ec_config.mode_1_actuation_offset   = eeprom_ec_config.mode_1_actuation_offset;
+    ec_config.mode_1_release_offset     = eeprom_ec_config.mode_1_release_offset;
+    ec_config.bottoming_calibration          = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.bottoming_calibration_starter[row][col]           = true;
+            ec_config.bottoming_reading[row][col]                       = eeprom_ec_config.bottoming_reading[row][col];
+            ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        }
+    }
+
+    // Set the RGB LEDs range that will be used for the effects
+    rgblight_set_effect_range(3, 66);
+    // Call the indicator callback to set the indicator color
+    indicators_callback();
+
+    keyboard_post_init_user();
+}
+
+// This function gets called when caps, num, scroll change
+bool led_update_kb(led_t led_state) {
+    indicators_callback();
+    return true;
+}
+
+// This function is called when layers change
+layer_state_t layer_state_set_user(layer_state_t state) {
+    indicators_callback();
+    return state;
+}
+
+// INDICATOR CALLBACK ------------------------------------------------------------------------------
+/* LED index to physical position
+ *
+ * LED2 | LED1 |  LED0
+ * -----+------+--------
+ * Num  | Caps | Scroll |
+ */
+bool indicators_callback(void) {
+    if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock))
+        rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX);
+    else
+        rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX);
+
+    if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock))
+        rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX);
+    else
+        rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX);
+
+    if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock))
+        rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX);
+    else
+        rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX);
+
+    return true;
+}
diff --git a/keyboards/cipulot/ec_typek/halconf.h b/keyboards/cipulot/ec_typek/halconf.h
new file mode 100644
index 00000000000..24de0954858
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/info.json
new file mode 100644
index 00000000000..e4642ee5553
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/info.json
@@ -0,0 +1,133 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "EC Type-K",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "features": {
+        "bootmagic": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 69,
+        "led_map": [0, 1, 2, 3, 4, 5, 66, 67, 68, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65],
+        "max_brightness": 200
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB4",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0.75, "y": 0},
+                {"matrix": [0, 0], "x": 2.5, "y": 0},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0},
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 10.25, "y": 1},
+                {"matrix": [1, 8], "x": 11.25, "y": 1},
+                {"matrix": [1, 9], "x": 12.25, "y": 1},
+                {"matrix": [1, 10], "x": 13.25, "y": 1},
+                {"matrix": [1, 11], "x": 14.25, "y": 1},
+                {"matrix": [1, 12], "x": 15.25, "y": 1},
+                {"matrix": [1, 13], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 17.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 0.25, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [2, 8], "x": 11.75, "y": 2},
+                {"matrix": [2, 9], "x": 12.75, "y": 2},
+                {"matrix": [2, 10], "x": 13.75, "y": 2},
+                {"matrix": [2, 11], "x": 14.75, "y": 2},
+                {"matrix": [2, 12], "x": 15.75, "y": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+                {"matrix": [3, 5], "x": 7, "y": 3},
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 10.5, "y": 3},
+                {"matrix": [3, 8], "x": 11.5, "y": 3},
+                {"matrix": [3, 9], "x": 12.5, "y": 3},
+                {"matrix": [3, 10], "x": 13.5, "y": 3},
+                {"matrix": [3, 11], "x": 14.5, "y": 3},
+                {"matrix": [3, 12], "x": 15.5, "y": 3},
+                {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4},
+                {"matrix": [4, 7], "x": 10, "y": 4},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 2},
+                {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/ec_typek/keymaps/default/keymap.c b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c
new file mode 100644
index 00000000000..e47e50680e0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,  KC_2,  KC_3,     KC_4,    KC_5,     KC_6,    KC_7,     KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,   KC_DEL,
+        KC_PGUP,  KC_TAB,   KC_Q,  KC_W,  KC_E,     KC_R,    KC_T,              KC_Y,     KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,   KC_BSPC,
+        KC_PGDN,  KC_CAPS,  KC_A,  KC_S,  KC_D,     KC_F,    KC_G,              KC_H,     KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER,
+        KC_LGUI,  KC_LSFT,  KC_Z,  KC_X,  KC_C,     KC_V,    KC_B,              KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
+        KC_LCTL,                          KC_LALT,  KC_SPC,  KC_LGUI,           KC_RGUI,  KC_SPC,  KC_RALT,                                           MO(1)
+    ),
+    [1] = LAYOUT(
+        _______,  _______,  KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,
+        KC_HOME,  _______,  _______,  KC_UP,    _______,   _______,  _______,            _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,
+        KC_END,   _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        _______,                                _______,   _______,  _______,            _______,  _______,  MO(2),                                             _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,                                _______,  _______,  _______,              _______,  _______,  _______,                                          _______)
+};
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/keymap.c b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c
new file mode 100644
index 00000000000..e47e50680e0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_ESC,   KC_GRV,   KC_1,  KC_2,  KC_3,     KC_4,    KC_5,     KC_6,    KC_7,     KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,   KC_DEL,
+        KC_PGUP,  KC_TAB,   KC_Q,  KC_W,  KC_E,     KC_R,    KC_T,              KC_Y,     KC_U,    KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,   KC_BSPC,
+        KC_PGDN,  KC_CAPS,  KC_A,  KC_S,  KC_D,     KC_F,    KC_G,              KC_H,     KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER,
+        KC_LGUI,  KC_LSFT,  KC_Z,  KC_X,  KC_C,     KC_V,    KC_B,              KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
+        KC_LCTL,                          KC_LALT,  KC_SPC,  KC_LGUI,           KC_RGUI,  KC_SPC,  KC_RALT,                                           MO(1)
+    ),
+    [1] = LAYOUT(
+        _______,  _______,  KC_F1,    KC_F2,    KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,
+        KC_HOME,  _______,  _______,  KC_UP,    _______,   _______,  _______,            _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  _______,  _______,  _______,
+        KC_END,   _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        _______,                                _______,   _______,  _______,            _______,  _______,  MO(2),                                             _______
+    ),
+    [2] = LAYOUT(
+        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,                                _______,  _______,  _______,              _______,  _______,  _______,                                          _______)
+};
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/rules.mk b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk
new file mode 100644
index 00000000000..b870b6349c0
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+SRC += via_ec_indicators.c
diff --git a/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c
new file mode 100644
index 00000000000..742dac0e6f1
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c
@@ -0,0 +1,502 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "keyboards/cipulot/common/eeprom_tools.h"
+#include "ec_switch_matrix.h"
+#include "action.h"
+#include "print.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+void ec_rescale_values(uint8_t item);
+void ec_save_threshold_data(uint8_t option);
+void ec_save_bottoming_reading(void);
+void ec_show_calibration_data(void);
+void ec_clear_bottoming_calibration_data(void);
+
+// Declaring enums for VIA config menu
+enum via_enums {
+    // clang-format off
+    id_num_indicator_enabled    = 1,
+    id_num_indicator_brightness = 2,
+    id_num_indicator_color      = 3,
+    id_caps_indicator_enabled    = 4,
+    id_caps_indicator_brightness = 5,
+    id_caps_indicator_color      = 6,
+    id_scroll_indicator_enabled    = 7,
+    id_scroll_indicator_brightness = 8,
+    id_scroll_indicator_color      = 9,
+    id_actuation_mode = 10,
+    id_mode_0_actuation_threshold = 11,
+    id_mode_0_release_threshold = 12,
+    id_save_threshold_data = 13,
+    id_mode_1_initial_deadzone_offset = 14,
+    id_mode_1_actuation_offset = 15,
+    id_mode_1_release_offset = 16,
+    id_bottoming_calibration = 17,
+    id_noise_floor_calibration = 18,
+    id_show_calibration_data = 19,
+    id_clear_bottoming_calibration_data = 20
+    // clang-format on
+};
+
+// Handle the data received by the keyboard from the VIA menus
+void via_config_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.num.enabled = true;
+                uprintf("#########################\n");
+                uprintf("# Num indicator enabled #\n");
+                uprintf("#########################\n");
+            } else {
+                eeprom_ec_config.num.enabled = false;
+                uprintf("##########################\n");
+                uprintf("# Num indicator disabled #\n");
+                uprintf("##########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled);
+            break;
+        }
+        case id_num_indicator_brightness: {
+            eeprom_ec_config.num.v = value_data[0];
+            uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v);
+            break;
+        }
+        case id_num_indicator_color: {
+            eeprom_ec_config.num.h = value_data[0];
+            eeprom_ec_config.num.s = value_data[1];
+            uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s);
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.caps.enabled = true;
+                uprintf("##########################\n");
+                uprintf("# Caps indicator enabled #\n");
+                uprintf("##########################\n");
+            } else {
+                eeprom_ec_config.caps.enabled = false;
+                uprintf("###########################\n");
+                uprintf("# Caps indicator disabled #\n");
+                uprintf("###########################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled);
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            eeprom_ec_config.caps.v = value_data[0];
+            uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v);
+            break;
+        }
+        case id_caps_indicator_color: {
+            eeprom_ec_config.caps.h = value_data[0];
+            eeprom_ec_config.caps.s = value_data[1];
+            uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s);
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            if (value_data[0] == 1) {
+                eeprom_ec_config.scroll.enabled = true;
+                uprintf("############################\n");
+                uprintf("# Scroll indicator enabled #\n");
+                uprintf("############################\n");
+            } else {
+                eeprom_ec_config.scroll.enabled = false;
+                uprintf("#############################\n");
+                uprintf("# Scroll indicator disabled #\n");
+                uprintf("#############################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled);
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            eeprom_ec_config.scroll.v = value_data[0];
+            uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v);
+            break;
+        }
+        case id_scroll_indicator_color: {
+            eeprom_ec_config.scroll.h = value_data[0];
+            eeprom_ec_config.scroll.s = value_data[1];
+            uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h);
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s);
+            break;
+        }
+        case id_actuation_mode: {
+            eeprom_ec_config.actuation_mode = value_data[0];
+            ec_config.actuation_mode        = eeprom_ec_config.actuation_mode;
+            if (ec_config.actuation_mode == 0) {
+                uprintf("#########################\n");
+                uprintf("#  Actuation Mode: APC  #\n");
+                uprintf("#########################\n");
+            } else if (ec_config.actuation_mode == 1) {
+                uprintf("#################################\n");
+                uprintf("# Actuation Mode: Rapid Trigger #\n");
+                uprintf("#################################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold);
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            eeprom_ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8);
+            ec_config.mode_0_release_threshold        = eeprom_ec_config.mode_0_release_threshold;
+            uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold);
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8);
+            uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset);
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            ec_config.mode_1_actuation_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Actuation Sensitivity: %d\n", ec_config.mode_1_actuation_offset);
+            break;
+        }
+        case id_mode_1_release_offset: {
+            ec_config.mode_1_release_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Release Sensitivity: %d\n", ec_config.mode_1_release_offset);
+            break;
+        }
+        case id_bottoming_calibration: {
+            if (value_data[0] == 1) {
+                ec_config.bottoming_calibration = true;
+                uprintf("##############################\n");
+                uprintf("# Bottoming calibration mode #\n");
+                uprintf("##############################\n");
+            } else {
+                ec_config.bottoming_calibration = false;
+                ec_save_bottoming_reading();
+                uprintf("## Bottoming calibration done ##\n");
+                ec_show_calibration_data();
+            }
+            break;
+        }
+        case id_save_threshold_data: {
+            ec_save_threshold_data(value_data[0]);
+            break;
+        }
+        case id_noise_floor_calibration: {
+            if (value_data[0] == 0) {
+                ec_noise_floor();
+                ec_rescale_values(0);
+                ec_rescale_values(1);
+                ec_rescale_values(2);
+                uprintf("#############################\n");
+                uprintf("# Noise floor data acquired #\n");
+                uprintf("#############################\n");
+                break;
+            }
+        }
+        case id_show_calibration_data: {
+            // Show calibration data once if the user toggle the switch
+            if (value_data[0] == 0) {
+                ec_show_calibration_data();
+                break;
+            }
+        }
+        case id_clear_bottoming_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_clear_bottoming_calibration_data();
+            }
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+
+    // Call the indicator callback to set the indicator color
+    indicators_callback();
+}
+
+// Handle the data sent by the keyboard to the VIA menus
+void via_config_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_num_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.num.enabled;
+            break;
+        }
+        case id_num_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.num.v;
+            break;
+        }
+        case id_num_indicator_color: {
+            value_data[0] = eeprom_ec_config.num.h;
+            value_data[1] = eeprom_ec_config.num.s;
+            break;
+        }
+        case id_caps_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.caps.enabled;
+            break;
+        }
+        case id_caps_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.caps.v;
+            break;
+        }
+        case id_caps_indicator_color: {
+            value_data[0] = eeprom_ec_config.caps.h;
+            value_data[1] = eeprom_ec_config.caps.s;
+            break;
+        }
+        case id_scroll_indicator_enabled: {
+            value_data[0] = eeprom_ec_config.scroll.enabled;
+            break;
+        }
+        case id_scroll_indicator_brightness: {
+            value_data[0] = eeprom_ec_config.scroll.v;
+            break;
+        }
+        case id_scroll_indicator_color: {
+            value_data[0] = eeprom_ec_config.scroll.h;
+            value_data[1] = eeprom_ec_config.scroll.s;
+            break;
+        }
+        case id_actuation_mode: {
+            value_data[0] = eeprom_ec_config.actuation_mode;
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF;
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF;
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8;
+            value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF;
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_actuation_offset;
+            break;
+        }
+        case id_mode_1_release_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_release_offset;
+            break;
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the commands sent and received by the keyboard with VIA
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if (*channel_id == id_custom_channel) {
+        switch (*command_id) {
+            case id_custom_set_value: {
+                via_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value: {
+                via_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save: {
+                // Bypass the save function in favor of pinpointed saves
+                break;
+            }
+            default: {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+}
+
+// Rescale the values received by VIA to fit the new range
+void ec_rescale_values(uint8_t item) {
+    switch (item) {
+        // Rescale the APC mode actuation thresholds
+        case 0:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the APC mode release thresholds
+        case 1:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the Rapid Trigger mode initial deadzone offsets
+        case 2:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+
+        default:
+            // Unhandled item.
+            break;
+    }
+}
+
+void ec_save_threshold_data(uint8_t option) {
+    // Save APC mode thresholds and rescale them for runtime usage
+    if (option == 0) {
+        eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold;
+        eeprom_ec_config.mode_0_release_threshold   = ec_config.mode_0_release_threshold;
+        ec_rescale_values(0);
+        ec_rescale_values(1);
+    }
+    // Save Rapid Trigger mode thresholds and rescale them for runtime usage
+    else if (option == 1) {
+        eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset;
+        ec_rescale_values(2);
+    }
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+    uprintf("####################################\n");
+    uprintf("# New thresholds applied and saved #\n");
+    uprintf("####################################\n");
+}
+
+// Save the bottoming reading
+void ec_save_bottoming_reading(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            // If the bottom reading doesn't go over the noise floor by 100, it is likely that:
+            // 1. The key is not actually in the matrix
+            // 2. The key is on an alternative layout, therefore not being pressed
+            // 3. The key in in the current layout but not being pressed
+            if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + 100)) {
+                eeprom_ec_config.bottoming_reading[row][col] = 1023;
+            } else {
+                eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col];
+            }
+        }
+    }
+    // Rescale the values to fit the new range for runtime usage
+    ec_rescale_values(0);
+    ec_rescale_values(1);
+    ec_rescale_values(2);
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+}
+
+// Show the calibration data
+void ec_show_calibration_data(void) {
+    uprintf("\n###############\n");
+    uprintf("# Noise Floor #\n");
+    uprintf("###############\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.noise_floor[row][col]);
+        }
+        uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################\n");
+    uprintf("# Bottoming Readings #\n");
+    uprintf("######################\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]);
+        }
+        uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Actuation Points #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Release Points   #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n#######################################################\n");
+    uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n");
+    uprintf("#######################################################\n");
+    uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Clear the calibration data
+void ec_clear_bottoming_calibration_data(void) {
+    // Clear the EEPROM data
+    eeconfig_init_kb();
+
+    // Reset the runtime values to the EEPROM values
+    keyboard_post_init_kb();
+
+    uprintf("######################################\n");
+    uprintf("# Bottoming calibration data cleared #\n");
+    uprintf("######################################\n");
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/ec_typek/matrix.c b/keyboards/cipulot/ec_typek/matrix.c
new file mode 100644
index 00000000000..cfa2efe0506
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/matrix.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "matrix.h"
+
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
+
+// Custom matrix init function
+void matrix_init_custom(void) {
+    // Initialize EC
+    ec_init();
+
+    // Get the noise floor at boot
+    ec_noise_floor();
+}
+
+// Custom matrix scan function
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool updated = ec_matrix_scan(current_matrix);
+
+    return updated;
+}
+
+// Bootmagic overriden to avoid conflicts with EC
+void bootmagic_scan(void) {
+    ;
+}
diff --git a/keyboards/cipulot/ec_typek/mcuconf.h b/keyboards/cipulot/ec_typek/mcuconf.h
new file mode 100644
index 00000000000..5f9ecca48dd
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/mcuconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_ADVANCED
+#define STM32_PWM_USE_ADVANCED TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/cipulot/ec_typek/readme.md b/keyboards/cipulot/ec_typek/readme.md
new file mode 100644
index 00000000000..44f6fd89440
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/readme.md
@@ -0,0 +1,26 @@
+# EC Type-K
+
+![EC Type-K](https://i.imgur.com/hFQ0qCfh.png)
+
+EC Type-K Keyboard by gok.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: EC Type-K
+* Hardware Availability: [gok](https://www.gok.design/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/ec_typek:default
+
+Flashing example for this keyboard:
+
+    make cipulot/ec_typek:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_typek/rules.mk b/keyboards/cipulot/ec_typek/rules.mk
new file mode 100644
index 00000000000..1ff311f102d
--- /dev/null
+++ b/keyboards/cipulot/ec_typek/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+SRC += matrix.c ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json
deleted file mode 100644
index 85a5f81c2b3..00000000000
--- a/keyboards/cipulot/kawayo/info.json
+++ /dev/null
@@ -1,620 +0,0 @@
-{
-    "keyboard_name": "Kawayo",
-    "manufacturer": "Cipulot",
-    "url": "https://mecha.store",
-    "maintainer": "Cipulot",
-    "usb": {
-        "vid": "0x6369",
-        "pid": "0x6B7F",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
-        "rows": ["B1", "B12", "C13", "A7", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
-    },
-    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-                {"matrix": [2, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [2, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "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": [2, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [2, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_cb_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_cb_blocker_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_cb_blocker_tsangan": {
-            "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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_cb_blocker_tsangan_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 13], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-                {"matrix": [4, 13], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/cipulot/kawayo/keyboard.json b/keyboards/cipulot/kawayo/keyboard.json
new file mode 100644
index 00000000000..ac4d24b9b53
--- /dev/null
+++ b/keyboards/cipulot/kawayo/keyboard.json
@@ -0,0 +1,629 @@
+{
+    "keyboard_name": "Kawayo",
+    "manufacturer": "Cipulot",
+    "url": "https://mecha.store",
+    "maintainer": "Cipulot",
+    "usb": {
+        "vid": "0x6369",
+        "pid": "0x6B7F",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"],
+        "rows": ["B1", "B12", "C13", "A7", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+    },
+    "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "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": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker_tsangan": {
+            "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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_cb_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk
deleted file mode 100644
index fbab9885cdb..00000000000
--- a/keyboards/cipulot/kawayo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-KEYBOARD_SHARED_EP = yes
-
-# 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/cipulot/mnk_60_ec/config.h b/keyboards/cipulot/mnk_60_ec/config.h
new file mode 100644
index 00000000000..1a7df486572
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS \
+    { B13, B14, B15, A8, A15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
+    { B6, B5, B4 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A3
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 149
diff --git a/keyboards/cipulot/mnk_60_ec/halconf.h b/keyboards/cipulot/mnk_60_ec/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/info.json
new file mode 100644
index 00000000000..802e216f672
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/info.json
@@ -0,0 +1,225 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "MNK 60 EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB6",
+        "vid": "0x6369"
+    },
+    "community_layouts": ["60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "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": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c
new file mode 100644
index 00000000000..6e2678d4f73
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_60_hhkb(
+        KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,   KC_5,    KC_6,   KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSLS,  KC_GRV,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
+        KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENTER,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
+
+    [1] = LAYOUT_60_hhkb(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,      KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
+        KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
+
+    [2] = LAYOUT_60_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                  _______,  _______,                                _______,                                _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c
new file mode 100644
index 00000000000..08599b93d3a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_60_tsangan_hhkb(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,     KC_9,    KC_0,     KC_MINS,  KC_EQL,    KC_BSLS,  KC_GRV,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,     KC_O,    KC_P,     KC_LBRC,  KC_RBRC,   KC_BSPC,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_QUOT,  KC_ENTER,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  MO(1),
+        KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                            KC_RCTL,  KC_RGUI,  KC_RALT),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,      KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,   KC_DEL,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+        _______,  _______,  _______,                                _______,                                  _______,  MO(2),     _______),
+
+    [2] = LAYOUT_60_tsangan_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c
new file mode 100644
index 00000000000..08599b93d3a
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_60_tsangan_hhkb(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,     KC_9,    KC_0,     KC_MINS,  KC_EQL,    KC_BSLS,  KC_GRV,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,     KC_O,    KC_P,     KC_LBRC,  KC_RBRC,   KC_BSPC,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_QUOT,  KC_ENTER,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,  MO(1),
+        KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                            KC_RCTL,  KC_RGUI,  KC_RALT),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,      KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,   KC_DEL,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  _______,
+        _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),    KC_SLSH,  KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,  KC_DOWN,   _______,   _______,
+        _______,  _______,  _______,                                _______,                                  _______,  MO(2),     _______),
+
+    [2] = LAYOUT_60_tsangan_hhkb(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______)
+    // clang-format on
+};
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk
rename to keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/mnk_60_ec/mcuconf.h b/keyboards/cipulot/mnk_60_ec/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/mnk_60_ec/post_rules.mk b/keyboards/cipulot/mnk_60_ec/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/mnk_60_ec/readme.md b/keyboards/cipulot/mnk_60_ec/readme.md
new file mode 100644
index 00000000000..85a770f1518
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/readme.md
@@ -0,0 +1,26 @@
+# MNK 60 EC
+
+![MNK 60 EC PCB](https://i.imgur.com/UpkCUKFh.jpeg)
+
+EC version of the Monokei MNK 66.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: MNK 60 EC PCB
+* Hardware Availability: [Monokei](https://monokei.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/mnk_60_ec:default
+
+Flashing example for this keyboard:
+
+    make cipulot/mnk_60_ec:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/mnk_60_ec/rules.mk b/keyboards/cipulot/mnk_60_ec/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/mnk_60_ec/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/mnk_65_ec/config.h b/keyboards/cipulot/mnk_65_ec/config.h
new file mode 100644
index 00000000000..01d1248c436
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B14, B15, A8, B12, A15 }
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
+    { B6, B5, B4 }
+
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6, 7 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 4, 5, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
+#define DISCHARGE_PIN A3
+#define ANALOG_PORT A2
+
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 159
diff --git a/keyboards/cipulot/mnk_65_ec/halconf.h b/keyboards/cipulot/mnk_65_ec/halconf.h
new file mode 100644
index 00000000000..835d43b6a0a
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/info.json
new file mode 100644
index 00000000000..5427601f760
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/info.json
@@ -0,0 +1,100 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "MNK 65 EC",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "processor": "STM32F401",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BB5",
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c
new file mode 100644
index 00000000000..03b9c3de33e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_65_ansi_blocker_tsangan(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGDN,
+        KC_LSFT,            KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          MO(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker_tsangan(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,   _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker_tsangan(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c
new file mode 100644
index 00000000000..03b9c3de33e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT_65_ansi_blocker_tsangan(
+        KC_ESC,   KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,   KC_PGDN,
+        KC_LSFT,            KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          MO(1),              KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker_tsangan(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  KC_INS,   _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker_tsangan(
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,            _______,  _______,  _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cipulot/mnk_65_ec/mcuconf.h b/keyboards/cipulot/mnk_65_ec/mcuconf.h
new file mode 100644
index 00000000000..fa3c955e0d8
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/cipulot/mnk_65_ec/post_rules.mk b/keyboards/cipulot/mnk_65_ec/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/mnk_65_ec/readme.md b/keyboards/cipulot/mnk_65_ec/readme.md
new file mode 100644
index 00000000000..aeedcc51c7e
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/readme.md
@@ -0,0 +1,26 @@
+# Monokei MNK 65 EC
+
+![MNK 65 EC PCB](https://i.imgur.com/k5ZvGhth.jpeg)
+
+EC version of the Monokei MNK 65.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: Monokei MNK 65 EC
+* Hardware Availability: [Monokei](https://monokei.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/mnk_65_ec:default
+
+Flashing example for this keyboard:
+
+    make cipulot/mnk_65_ec:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/mnk_65_ec/rules.mk b/keyboards/cipulot/mnk_65_ec/rules.mk
new file mode 100644
index 00000000000..ce525670a68
--- /dev/null
+++ b/keyboards/cipulot/mnk_65_ec/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+ANALOG_DRIVER_REQUIRED = yes
+VPATH += keyboards/cipulot/common
+SRC += matrix.c ec_board.c ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/clueboard/2x1800/2021/max7219.c b/keyboards/clueboard/2x1800/2021/max7219.c
index 1ba22362fe4..81d26b9a518 100644
--- a/keyboards/clueboard/2x1800/2021/max7219.c
+++ b/keyboards/clueboard/2x1800/2021/max7219.c
@@ -40,6 +40,10 @@
  */
 
 #include "max7219.h"
+#include "spi_master.h"
+#include "debug.h"
+#include "gpio.h"
+#include "wait.h"
 #include "font.h"
 
 // Datastructures
diff --git a/keyboards/clueboard/2x1800/2021/max7219.h b/keyboards/clueboard/2x1800/2021/max7219.h
index 95d1d9389d1..6d78345d5d9 100644
--- a/keyboards/clueboard/2x1800/2021/max7219.h
+++ b/keyboards/clueboard/2x1800/2021/max7219.h
@@ -26,8 +26,10 @@
  *    OTHER DEALINGS IN THE SOFTWARE.
  */
 #pragma once
-#include "quantum.h"
-#include "spi_master.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 // Set defaults if they're not set
 #ifndef MAX7219_LOAD
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
index 4dfa570cbcc..9bd7f227dc1 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT_66_ansi(
-  BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   RGB_TOG,           RGB_VAI,
+  LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   RGB_TOG,           RGB_VAI,
   _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                RGB_VAD,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
index 2a1a7722721..07f7d0f7dea 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
@@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _CL: Control layer
    */
 [_CL] = LAYOUT(
-  BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   BL_TOGG,           BL_UP, 
-  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                BL_DOWN,
+  LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______,   LM_TOGG,           LM_BRIU, 
+  _______,_______,_______,_______,QK_BOOT,  _______,_______,_______,_______,_______,_______,_______,_______,_______,                LM_BRID,
   _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,    _______,
   _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,        RGB_SAI,
-  _______,_______,_______,                BL_BRTG,BL_BRTG,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
+  _______,_______,_______,                _______,_______,                        _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
 };
 
 
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
deleted file mode 100644
index 2ef1fbec1eb..00000000000
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-  "manufacturer": "Clueboard",
-  "keyboard_name": "Clueboard 66% HotSwap Prototype",
-  "maintainer": "skullydazed",
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "features": {
-    "audio": true,
-    "backlight": true,
-    "bootmagic": false,
-    "command": false,
-    "console": true,
-    "extrakey": true,
-    "mousekey": false,
-    "nkro": true,
-    "rgblight": true
-  },
-  "indicators": {
-    "caps_lock": "B4"
-  },
-  "matrix_pins": {
-    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"],
-    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]
-  },
-  "rgblight": {
-    "animations": {
-      "alternating": true,
-      "breathing": true,
-      "christmas": true,
-      "knight": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "rgb_test": true,
-      "snake": true,
-      "static_gradient": true,
-      "twinkle": true
-    },
-    "brightness_steps": 17,
-    "hue_steps": 32,
-    "led_count": 26,
-    "saturation_steps": 17
-  },
-  "ws2812": {
-    "pin": "D7"
-  },
-  "usb": {
-    "device_version": "0.0.1",
-    "pid": "0x2390",
-    "vid": "0xC1ED"
-  },
-  "backlight": {
-    "driver": "custom",
-    "levels": 1
-  },
-  "community_layouts": ["66_ansi"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
-  },
-  "layouts": {
-    "LAYOUT_66_ansi": {
-      "layout": [
-        {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
-        {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
-        {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
-        {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
-        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
-        {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
-        {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
-        {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
-        {"label": "k50", "matrix": [5, 0], "x": 8, "y": 0},
-        {"label": "k51", "matrix": [5, 1], "x": 9, "y": 0},
-        {"label": "k52", "matrix": [5, 2], "x": 10, "y": 0},
-        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
-        {"label": "k54", "matrix": [5, 4], "x": 12, "y": 0},
-        {"label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0},
-        {"label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0},
-        {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-        {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1},
-        {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1},
-        {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
-        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
-        {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1},
-        {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1},
-        {"label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1},
-        {"label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1},
-        {"label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1},
-        {"label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1},
-        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
-        {"label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1},
-        {"label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1},
-        {"label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1},
-        {"label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-        {"label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2},
-        {"label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2},
-        {"label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2},
-        {"label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2},
-        {"label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2},
-        {"label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2},
-        {"label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2},
-        {"label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2},
-        {"label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2},
-        {"label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2},
-        {"label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2},
-        {"label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2},
-        {"label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
-        {"label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3},
-        {"label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3},
-        {"label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3},
-        {"label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3},
-        {"label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3},
-        {"label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3},
-        {"label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3},
-        {"label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3},
-        {"label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3},
-        {"label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3},
-        {"label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3},
-        {"label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3},
-        {"label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-        {"label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-        {"label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-        {"label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
-        {"label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4},
-        {"label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4},
-        {"label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4},
-        {"label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4},
-        {"label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4},
-        {"label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4}
-      ]
-    },
-    "LAYOUT_all": {
-      "layout": [
-        {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
-        {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
-        {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
-        {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
-        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
-        {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
-        {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
-        {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
-        {"label": "k50", "matrix": [5, 0], "x": 8, "y": 0},
-        {"label": "k51", "matrix": [5, 1], "x": 9, "y": 0},
-        {"label": "k52", "matrix": [5, 2], "x": 10, "y": 0},
-        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
-        {"label": "k54", "matrix": [5, 4], "x": 12, "y": 0},
-        {"label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0},
-        {"label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0},
-        {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-        {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1},
-        {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1},
-        {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
-        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
-        {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1},
-        {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1},
-        {"label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1},
-        {"label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1},
-        {"label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1},
-        {"label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1},
-        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
-        {"label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1},
-        {"label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1},
-        {"label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1},
-        {"label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-        {"label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2},
-        {"label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2},
-        {"label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2},
-        {"label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2},
-        {"label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2},
-        {"label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2},
-        {"label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2},
-        {"label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2},
-        {"label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2},
-        {"label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2},
-        {"label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2},
-        {"label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2},
-        {"label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
-        {"label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3},
-        {"label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3},
-        {"label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3},
-        {"label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3},
-        {"label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3},
-        {"label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3},
-        {"label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3},
-        {"label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3},
-        {"label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3},
-        {"label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3},
-        {"label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3},
-        {"label": "k84", "matrix": [8, 4], "x": 12.25, "y": 3},
-        {"label": "k85", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3},
-        {"label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3},
-        {"label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-        {"label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-        {"label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-        {"label": "k45", "matrix": [4, 5], "w": 2.75, "x": 3.75, "y": 4},
-        {"label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
-        {"label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4},
-        {"label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4},
-        {"label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4},
-        {"label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4},
-        {"label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4},
-        {"label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4},
-        {"label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/clueboard/66_hotswap/prototype/keyboard.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json
new file mode 100644
index 00000000000..9d0b0dd27c7
--- /dev/null
+++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json
@@ -0,0 +1,209 @@
+{
+  "manufacturer": "Clueboard",
+  "keyboard_name": "Clueboard 66% HotSwap Prototype",
+  "maintainer": "skullydazed",
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "audio": true,
+    "backlight": true,
+    "bootmagic": false,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true,
+    "rgblight": true
+  },
+  "build": {
+    "lto": true
+  },
+  "indicators": {
+    "caps_lock": "B4"
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "B1"],
+    "rows": ["B2", "C7", "C6", "B6", "B5", "B0", "B3", "D5", "D3", "D2"]
+  },
+  "rgblight": {
+    "animations": {
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
+    },
+    "brightness_steps": 17,
+    "hue_steps": 32,
+    "led_count": 26,
+    "saturation_steps": 17
+  },
+  "ws2812": {
+    "pin": "D7"
+  },
+  "usb": {
+    "device_version": "0.0.1",
+    "pid": "0x2390",
+    "vid": "0xC1ED"
+  },
+  "backlight": {
+    "driver": "custom",
+    "levels": 1
+  },
+  "community_layouts": ["66_ansi"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
+  "layouts": {
+    "LAYOUT_66_ansi": {
+      "layout": [
+        {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "k50", "matrix": [5, 0], "x": 8, "y": 0},
+        {"label": "k51", "matrix": [5, 1], "x": 9, "y": 0},
+        {"label": "k52", "matrix": [5, 2], "x": 10, "y": 0},
+        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
+        {"label": "k54", "matrix": [5, 4], "x": 12, "y": 0},
+        {"label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0},
+        {"label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0},
+        {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+        {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1},
+        {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1},
+        {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
+        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
+        {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1},
+        {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1},
+        {"label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1},
+        {"label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1},
+        {"label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1},
+        {"label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1},
+        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
+        {"label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1},
+        {"label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1},
+        {"label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1},
+        {"label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+        {"label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2},
+        {"label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2},
+        {"label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2},
+        {"label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2},
+        {"label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2},
+        {"label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2},
+        {"label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2},
+        {"label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2},
+        {"label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2},
+        {"label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2},
+        {"label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2},
+        {"label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2},
+        {"label": "k30", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+        {"label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3},
+        {"label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3},
+        {"label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3},
+        {"label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3},
+        {"label": "k85", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3},
+        {"label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3},
+        {"label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+        {"label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+        {"label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+        {"label": "k46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+        {"label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4},
+        {"label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4},
+        {"label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4},
+        {"label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4},
+        {"label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4},
+        {"label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4}
+      ]
+    },
+    "LAYOUT_all": {
+      "layout": [
+        {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "k50", "matrix": [5, 0], "x": 8, "y": 0},
+        {"label": "k51", "matrix": [5, 1], "x": 9, "y": 0},
+        {"label": "k52", "matrix": [5, 2], "x": 10, "y": 0},
+        {"label": "k53", "matrix": [5, 3], "x": 11, "y": 0},
+        {"label": "k54", "matrix": [5, 4], "x": 12, "y": 0},
+        {"label": "k56", "matrix": [5, 6], "w": 2, "x": 13, "y": 0},
+        {"label": "k57", "matrix": [5, 7], "x": 15.5, "y": 0},
+        {"label": "k10", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+        {"label": "k11", "matrix": [1, 1], "x": 1.5, "y": 1},
+        {"label": "k12", "matrix": [1, 2], "x": 2.5, "y": 1},
+        {"label": "k13", "matrix": [1, 3], "x": 3.5, "y": 1},
+        {"label": "k14", "matrix": [1, 4], "x": 4.5, "y": 1},
+        {"label": "k15", "matrix": [1, 5], "x": 5.5, "y": 1},
+        {"label": "k16", "matrix": [1, 6], "x": 6.5, "y": 1},
+        {"label": "k17", "matrix": [1, 7], "x": 7.5, "y": 1},
+        {"label": "k60", "matrix": [6, 0], "x": 8.5, "y": 1},
+        {"label": "k61", "matrix": [6, 1], "x": 9.5, "y": 1},
+        {"label": "k62", "matrix": [6, 2], "x": 10.5, "y": 1},
+        {"label": "k63", "matrix": [6, 3], "x": 11.5, "y": 1},
+        {"label": "k64", "matrix": [6, 4], "x": 12.5, "y": 1},
+        {"label": "k65", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1},
+        {"label": "k67", "matrix": [6, 7], "x": 15.5, "y": 1},
+        {"label": "k20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+        {"label": "k21", "matrix": [2, 1], "x": 1.75, "y": 2},
+        {"label": "k22", "matrix": [2, 2], "x": 2.75, "y": 2},
+        {"label": "k23", "matrix": [2, 3], "x": 3.75, "y": 2},
+        {"label": "k24", "matrix": [2, 4], "x": 4.75, "y": 2},
+        {"label": "k25", "matrix": [2, 5], "x": 5.75, "y": 2},
+        {"label": "k26", "matrix": [2, 6], "x": 6.75, "y": 2},
+        {"label": "k27", "matrix": [2, 7], "x": 7.75, "y": 2},
+        {"label": "k70", "matrix": [7, 0], "x": 8.75, "y": 2},
+        {"label": "k71", "matrix": [7, 1], "x": 9.75, "y": 2},
+        {"label": "k72", "matrix": [7, 2], "x": 10.75, "y": 2},
+        {"label": "k73", "matrix": [7, 3], "x": 11.75, "y": 2},
+        {"label": "k75", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2},
+        {"label": "k30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+        {"label": "k31", "matrix": [3, 1], "x": 1.25, "y": 3},
+        {"label": "k32", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "k33", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "k34", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "k35", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "k36", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "k37", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "k80", "matrix": [8, 0], "x": 8.25, "y": 3},
+        {"label": "k81", "matrix": [8, 1], "x": 9.25, "y": 3},
+        {"label": "k82", "matrix": [8, 2], "x": 10.25, "y": 3},
+        {"label": "k83", "matrix": [8, 3], "x": 11.25, "y": 3},
+        {"label": "k84", "matrix": [8, 4], "x": 12.25, "y": 3},
+        {"label": "k85", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3},
+        {"label": "k86", "matrix": [8, 6], "x": 14.5, "y": 3},
+        {"label": "k40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+        {"label": "k41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+        {"label": "k42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+        {"label": "k45", "matrix": [4, 5], "w": 2.75, "x": 3.75, "y": 4},
+        {"label": "k46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
+        {"label": "k90", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4},
+        {"label": "k92", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4},
+        {"label": "k93", "matrix": [9, 3], "x": 11.25, "y": 4},
+        {"label": "k94", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4},
+        {"label": "k95", "matrix": [9, 5], "x": 13.5, "y": 4},
+        {"label": "k96", "matrix": [9, 6], "x": 14.5, "y": 4},
+        {"label": "k97", "matrix": [9, 7], "x": 15.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk
deleted file mode 100644
index 4da205a168c..00000000000
--- a/keyboards/clueboard/66_hotswap/prototype/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json
deleted file mode 100644
index 8d51f1e9272..00000000000
--- a/keyboards/coarse/ixora/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "keyboard_name": "Ixora Rev1",
-    "manufacturer": "PeiorisBoards",
-    "url": "",
-    "maintainer": "Peioris",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0C61",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "A15", "B3", "A1", "B6", "B5"],
-        "rows": ["A0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A10",
-        "num_lock": "A9",
-        "scroll_lock": "A8"
-    },
-    "processor": "STM32F042",
-    "bootloader": "stm32-dfu",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT_full": {
-            "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": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1}
-            ]
-        },
-        "LAYOUT_blocker_right": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1}
-            ]
-        },
-        "LAYOUT_blocker_left": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1}
-            ]
-        },
-        "LAYOUT_arrows": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/coarse/ixora/keyboard.json b/keyboards/coarse/ixora/keyboard.json
new file mode 100644
index 00000000000..33ba2270acf
--- /dev/null
+++ b/keyboards/coarse/ixora/keyboard.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Ixora Rev1",
+    "manufacturer": "PeiorisBoards",
+    "url": "",
+    "maintainer": "Peioris",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0C61",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["B4", "A15", "B3", "A1", "B6", "B5"],
+        "rows": ["A0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A10",
+        "num_lock": "A9",
+        "scroll_lock": "A8"
+    },
+    "processor": "STM32F042",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT_full": {
+            "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": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1}
+            ]
+        },
+        "LAYOUT_blocker_right": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1}
+            ]
+        },
+        "LAYOUT_blocker_left": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1}
+            ]
+        },
+        "LAYOUT_arrows": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk
deleted file mode 100644
index af1134ce298..00000000000
--- a/keyboards/coarse/ixora/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-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
-NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in
-
-
diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json
deleted file mode 100644
index 3dd9898f1aa..00000000000
--- a/keyboards/coarse/vinta/info.json
+++ /dev/null
@@ -1,253 +0,0 @@
-{
-  "keyboard_name": "Vinta R1",
-  "manufacturer": "PeiorisBoards",
-  "url": "",
-  "maintainer": "Peioris",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0C61",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"],
-    "rows": ["A10", "A9", "B0", "A7", "A6"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "STM32F042",
-  "bootloader": "stm32-dfu",
-  "debounce": 0,
-  "community_layouts": ["65_ansi_blocker"],
-  "layout_aliases": {
-    "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
-  },
-  "layouts": {
-    "LAYOUT_69_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-        {"matrix": [0, 15], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 15], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 15], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 1], "x": 2.25, "y": 3},
-        {"matrix": [3, 2], "x": 3.25, "y": 3},
-        {"matrix": [3, 3], "x": 4.25, "y": 3},
-        {"matrix": [3, 4], "x": 5.25, "y": 3},
-        {"matrix": [3, 5], "x": 6.25, "y": 3},
-        {"matrix": [3, 6], "x": 7.25, "y": 3},
-        {"matrix": [3, 7], "x": 8.25, "y": 3},
-        {"matrix": [3, 8], "x": 9.25, "y": 3},
-        {"matrix": [3, 9], "x": 10.25, "y": 3},
-        {"matrix": [3, 10], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-        {"matrix": [3, 15], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 12], "x": 12, "y": 4},
-        {"matrix": [4, 13], "x": 13, "y": 4},
-        {"matrix": [4, 14], "x": 14, "y": 4},
-        {"matrix": [4, 15], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_68_tada": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"matrix": [0, 15], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 15], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 15], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 1], "x": 2.25, "y": 3},
-        {"matrix": [3, 2], "x": 3.25, "y": 3},
-        {"matrix": [3, 3], "x": 4.25, "y": 3},
-        {"matrix": [3, 4], "x": 5.25, "y": 3},
-        {"matrix": [3, 5], "x": 6.25, "y": 3},
-        {"matrix": [3, 6], "x": 7.25, "y": 3},
-        {"matrix": [3, 7], "x": 8.25, "y": 3},
-        {"matrix": [3, 8], "x": 9.25, "y": 3},
-        {"matrix": [3, 9], "x": 10.25, "y": 3},
-        {"matrix": [3, 10], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-        {"matrix": [3, 15], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4},
-        {"matrix": [4, 10], "x": 11, "y": 4},
-        {"matrix": [4, 12], "x": 12, "y": 4},
-        {"matrix": [4, 13], "x": 13, "y": 4},
-        {"matrix": [4, 14], "x": 14, "y": 4},
-        {"matrix": [4, 15], "x": 15, "y": 4}
-      ]
-    },
-    "LAYOUT_65_ansi_blocker": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"matrix": [0, 15], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-        {"matrix": [1, 15], "x": 15, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
-        {"matrix": [2, 15], "x": 15, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 1], "x": 2.25, "y": 3},
-        {"matrix": [3, 2], "x": 3.25, "y": 3},
-        {"matrix": [3, 3], "x": 4.25, "y": 3},
-        {"matrix": [3, 4], "x": 5.25, "y": 3},
-        {"matrix": [3, 5], "x": 6.25, "y": 3},
-        {"matrix": [3, 6], "x": 7.25, "y": 3},
-        {"matrix": [3, 7], "x": 8.25, "y": 3},
-        {"matrix": [3, 8], "x": 9.25, "y": 3},
-        {"matrix": [3, 9], "x": 10.25, "y": 3},
-        {"matrix": [3, 10], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 14, "y": 3},
-        {"matrix": [3, 15], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 13], "x": 13, "y": 4},
-        {"matrix": [4, 14], "x": 14, "y": 4},
-        {"matrix": [4, 15], "x": 15, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/coarse/vinta/keyboard.json b/keyboards/coarse/vinta/keyboard.json
new file mode 100644
index 00000000000..df9aa7e5a18
--- /dev/null
+++ b/keyboards/coarse/vinta/keyboard.json
@@ -0,0 +1,259 @@
+{
+  "keyboard_name": "Vinta R1",
+  "manufacturer": "PeiorisBoards",
+  "url": "",
+  "maintainer": "Peioris",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0C61",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"],
+    "rows": ["A10", "A9", "B0", "A7", "A6"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "STM32F042",
+  "bootloader": "stm32-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
+  "debounce": 0,
+  "community_layouts": ["65_ansi_blocker"],
+  "layout_aliases": {
+    "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
+  },
+  "layouts": {
+    "LAYOUT_69_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_68_tada": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4},
+        {"matrix": [4, 10], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
+    },
+    "LAYOUT_65_ansi_blocker": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 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, 14], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk
deleted file mode 100644
index cedbfeb321f..00000000000
--- a/keyboards/coarse/vinta/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-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
-NO_USB_STARTUP_CHECK = no         	# Disable initialization only when usb is plugged in
-
diff --git a/keyboards/compensator/keyboard.json b/keyboards/compensator/keyboard.json
index ceaa1763338..fbba0d750e8 100644
--- a/keyboards/compensator/keyboard.json
+++ b/keyboards/compensator/keyboard.json
@@ -28,8 +28,7 @@
         "layer_count": 3
     },
     "indicators": {
-        "caps_lock": "E6",
-        "on_state": 0
+        "caps_lock": "E6"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c
index 5e39c20e72f..0bdf18496a8 100644
--- a/keyboards/compensator/keymaps/default/keymap.c
+++ b/keyboards/compensator/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
-        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
         KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
         KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                  KC_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
         KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c
index d9124a96aff..a7285b32577 100644
--- a/keyboards/compensator/keymaps/via/keymap.c
+++ b/keyboards/compensator/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
-        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
         KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
         KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                  KC_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
         KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json
index bff73f7e6ff..6657a7485b1 100644
--- a/keyboards/controllerworks/city42/info.json
+++ b/keyboards/controllerworks/city42/info.json
@@ -14,7 +14,8 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true
+        "rgb_matrix": true,
+        "pointing_device": true
     },
     "matrix_pins": {
         "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"],
@@ -174,4 +175,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk
index 2e0f2befbf4..fb5d6497359 100644
--- a/keyboards/controllerworks/city42/rules.mk
+++ b/keyboards/controllerworks/city42/rules.mk
@@ -1,2 +1 @@
-POINTING_DEVICE_ENABLE = yes
-POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
\ No newline at end of file
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
index b553dfc10ff..47467a97c72 100644
--- a/keyboards/converter/adb_usb/info.json
+++ b/keyboards/converter/adb_usb/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0ADB",
     "device_version": "1.0.1"
   },
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true
+  },
   "layouts": {
     "LAYOUT_ext_ansi": {
       "layout": [
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 4e4d068a704..28df56c337d 100644
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no        # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no         # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
-CONSOLE_ENABLE = no          # Console for debug
-COMMAND_ENABLE = no          # Commands for debug and configuration
-NKRO_ENABLE = no             # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow
-AUDIO_ENABLE = no            # Audio output
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c adb.c led.c
diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json
index da29c72fac7..0296bda5e98 100644
--- a/keyboards/converter/hp_46010a/info.json
+++ b/keyboards/converter/hp_46010a/info.json
@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "halfkay",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "nkro": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk
index 104381f12fc..3c6124d20ab 100644
--- a/keyboards/converter/hp_46010a/rules.mk
+++ b/keyboards/converter/hp_46010a/rules.mk
@@ -1,16 +1,3 @@
-# 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 = 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.
-SPLIT_KEYBOARD = no
 WAIT_FOR_USB = yes
 CUSTOM_MATRIX = yes
 
diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json
index 39840eb6276..b95ea58d206 100644
--- a/keyboards/converter/ibm_terminal/info.json
+++ b/keyboards/converter/ibm_terminal/info.json
@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true,
+    "ps2": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk
index c04e7e01a47..038d8da5a2f 100644
--- a/keyboards/converter/ibm_terminal/rules.mk
+++ b/keyboards/converter/ibm_terminal/rules.mk
@@ -1,16 +1,3 @@
-# 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-PS2_ENABLE = yes
 PS2_DRIVER = usart
 CUSTOM_MATRIX = yes
 
diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json
index 1869d2dacb8..522f83caba1 100644
--- a/keyboards/converter/m0110_usb/info.json
+++ b/keyboards/converter/m0110_usb/info.json
@@ -10,6 +10,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "console": true,
+    "extrakey": true,
+    "usb_hid": true
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [
diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk
index a9dc1a9e499..7021c1052a2 100644
--- a/keyboards/converter/m0110_usb/rules.mk
+++ b/keyboards/converter/m0110_usb/rules.mk
@@ -1,17 +1,6 @@
 # Processor frequency
 F_CPU = 8000000
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = no   # Mouse keys
-CONSOLE_ENABLE   = yes  # Console for debug
-COMMAND_ENABLE   = no   # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-EXTRAKEY_ENABLE  = yes
-USB_HID_ENABLE   = yes
-BACKLIGHT_ENABLE = no
 CUSTOM_MATRIX    = yes
 
 SRC = matrix.c m0110.c
diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json
index 2fe66720ec7..c5b893d7576 100644
--- a/keyboards/converter/palm_usb/info.json
+++ b/keyboards/converter/palm_usb/info.json
@@ -9,5 +9,12 @@
         "device_version": "1.0.0"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true,
+        "command": true
+    }
 }
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk
index 72d9daf6d9a..bdb3bb0d6bb 100644
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 #HARDWARE_SERIAL = yes
 CUSTOM_MATRIX = yes
 
diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/info.json
deleted file mode 100644
index 08cc8ee9bf3..00000000000
--- a/keyboards/converter/periboard_512/info.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "keyboard_name": "Periboard 512",
-    "manufacturer": "Sife",
-    "url": "https://github.com/Sife-ops/qmk_firmware/tree/periboard_512/keyboards/converter/periboard_512",
-    "maintainer": "Sife-ops",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "processor": "at90usb1286",
-    "bootloader": "halfkay",
-    "diode_direction": "ROW2COL",
-    "matrix_pins": {
-        "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
-        "rows": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 7], "x": 0, "y": 0, "h": 0.833},
-
-                {"matrix": [0, 6], "x": 2, "y": 0, "h": 0.833},
-                {"matrix": [0, 5], "x": 3, "y": 0, "h": 0.833},
-                {"matrix": [4, 5], "x": 4, "y": 0, "h": 0.833},
-                {"matrix": [5, 5], "x": 5, "y": 0, "h": 0.833},
-                {"matrix": [5, 16], "x": 6, "y": 0, "h": 0.833},
-                {"matrix": [5, 3], "x": 7, "y": 0, "h": 0.833},
-                {"matrix": [4, 2], "x": 8, "y": 0, "h": 0.833},
-                {"matrix": [0, 2], "x": 9, "y": 0, "h": 0.833},
-                {"matrix": [0, 16], "x": 10, "y": 0, "h": 0.833},
-                {"matrix": [1, 16], "x": 11, "y": 0, "h": 0.833},
-                {"matrix": [1, 14], "x": 12, "y": 0, "h": 0.833},
-                {"matrix": [1, 15], "x": 13, "y": 0, "h": 0.833},
-                {"matrix": [1, 11], "x": 14.25, "y": 0, "h": 0.833},
-                {"matrix": [2, 11], "x": 15.25, "y": 0, "h": 0.833},
-                {"matrix": [6, 12], "x": 16.25, "y": 0, "h": 0.833},
-
-                {"matrix": [0, 7], "x": 0, "y": 1.333},
-                {"matrix": [1, 7], "x": 1, "y": 1.333},
-                {"matrix": [1, 6], "x": 2, "y": 1.333},
-                {"matrix": [1, 5], "x": 3, "y": 1.333},
-                {"matrix": [1, 10], "x": 4, "y": 1.333},
-                {"matrix": [0, 10], "x": 5, "y": 1.333},
-                {"matrix": [0, 18], "x": 6, "y": 1.333},
-                {"matrix": [1, 18], "x": 7, "y": 1.333},
-                {"matrix": [1, 3], "x": 8, "y": 1.333},
-                {"matrix": [1, 2], "x": 9, "y": 1.333},
-                {"matrix": [1, 1], "x": 10, "y": 1.333},
-                {"matrix": [0, 1], "x": 11, "y": 1.333},
-                {"matrix": [0, 3], "x": 12, "y": 1.333},
-                {"matrix": [4, 16], "x": 13, "y": 1.333, "w": 2},
-
-                {"matrix": [0, 15], "x": 16.25, "y": 3, "h": 0.833},
-
-                {"matrix": [0, 12], "x": 15.25, "y": 1.333, "h": 0.833},
-                {"matrix": [0, 13], "x": 16.25, "y": 1.333, "h": 0.833},
-
-                {"matrix": [6, 14], "x": 17.5, "y": 1.333},
-                {"matrix": [6, 15], "x": 18.5, "y": 1.333},
-                {"matrix": [6, 13], "x": 19.5, "y": 1.333},
-                {"matrix": [7, 13], "x": 20.5, "y": 1.333},
-
-                {"matrix": [4, 7], "x": 0, "y": 2.333, "w": 1.5},
-                {"matrix": [2, 7], "x": 1.5, "y": 2.333},
-                {"matrix": [2, 6], "x": 2.5, "y": 2.333},
-                {"matrix": [2, 5], "x": 3.5, "y": 2.333},
-                {"matrix": [2, 10], "x": 4.5, "y": 2.333},
-                {"matrix": [4, 10], "x": 5.5, "y": 2.333},
-                {"matrix": [4, 4], "x": 6.5, "y": 2.333},
-                {"matrix": [2, 4], "x": 7.5, "y": 2.333},
-                {"matrix": [2, 3], "x": 8.5, "y": 2.333},
-                {"matrix": [2, 2], "x": 9.5, "y": 2.333},
-                {"matrix": [2, 1], "x": 10.5, "y": 2.333},
-                {"matrix": [4, 1], "x": 11.5, "y": 2.333},
-                {"matrix": [4, 3], "x": 12.5, "y": 2.333},
-                {"matrix": [3, 16], "x": 13.5, "y": 2.333, "w": 1.5},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 3, "h": 0.833},
-
-                {"matrix": [1, 12], "x": 15.25, "y": 2.167, "h": 0.833},
-                {"matrix": [1, 13], "x": 16.25, "y": 2.167, "h": 0.833},
-
-                {"matrix": [2, 14], "x": 17.5, "y": 2.333},
-                {"matrix": [2, 15], "x": 18.5, "y": 2.333},
-                {"matrix": [2, 13], "x": 19.5, "y": 2.333},
-                {"matrix": [2, 12], "x": 20.5, "y": 2.333, "h": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3.333, "w": 1.75},
-                {"matrix": [3, 7], "x": 1.75, "y": 3.333},
-                {"matrix": [3, 6], "x": 2.75, "y": 3.333},
-                {"matrix": [3, 5], "x": 3.75, "y": 3.333},
-                {"matrix": [3, 10], "x": 4.75, "y": 3.333},
-                {"matrix": [5, 10], "x": 5.75, "y": 3.333},
-                {"matrix": [5, 4], "x": 6.75, "y": 3.333},
-                {"matrix": [3, 4], "x": 7.75, "y": 3.333},
-                {"matrix": [3, 3], "x": 8.75, "y": 3.333},
-                {"matrix": [3, 2], "x": 9.75, "y": 3.333},
-                {"matrix": [3, 1], "x": 10.75, "y": 3.333},
-                {"matrix": [5, 1], "x": 11.75, "y": 3.333},
-                {"matrix": [6, 16], "x": 12.75, "y": 3.333, "w": 2.25},
-
-                {"matrix": [4, 14], "x": 17.5, "y": 3.333},
-                {"matrix": [4, 15], "x": 18.5, "y": 3.333},
-                {"matrix": [4, 13], "x": 19.5, "y": 3.333},
-
-                {"matrix": [4, 9], "x": 0, "y": 4.333, "w": 2.25},
-                {"matrix": [6, 7], "x": 2.25, "y": 4.333},
-                {"matrix": [6, 6], "x": 3.25, "y": 4.333},
-                {"matrix": [6, 5], "x": 4.25, "y": 4.333},
-                {"matrix": [6, 10], "x": 5.25, "y": 4.333},
-                {"matrix": [7, 10], "x": 6.25, "y": 4.333},
-                {"matrix": [7, 4], "x": 7.25, "y": 4.333},
-                {"matrix": [6, 4], "x": 8.25, "y": 4.333},
-                {"matrix": [6, 3], "x": 9.25, "y": 4.333},
-                {"matrix": [6, 2], "x": 10.25, "y": 4.333},
-                {"matrix": [7, 1], "x": 11.25, "y": 4.333},
-                {"matrix": [6, 9], "x": 12.25, "y": 4.333, "w": 2.75},
-
-                {"matrix": [5, 12], "x": 15.75, "y": 3.833, "h": 0.833},
-
-                {"matrix": [3, 14], "x": 17.5, "y": 4.333},
-                {"matrix": [3, 15], "x": 18.5, "y": 4.333},
-                {"matrix": [3, 13], "x": 19.5, "y": 4.333},
-                {"matrix": [3, 12], "x": 20.5, "y": 4.333, "h": 2},
-
-                {"matrix": [0, 8], "x": 0, "y": 5.333, "w": 1.25},
-                {"matrix": [3, 17], "x": 1.25, "y": 5.333, "w": 1.25},
-                {"matrix": [5, 11], "x": 2.5, "y": 5.333, "w": 1.25},
-                {"matrix": [7, 16], "x": 3.75, "y": 5.333, "w": 6.25},
-                {"matrix": [7, 11], "x": 10, "y": 5.333, "w": 1.25},
-                {"matrix": [6, 0], "x": 11.25, "y": 5.333, "w": 1.25},
-                {"matrix": [2, 17], "x": 12.5, "y": 5.333, "w": 1.25},
-                {"matrix": [6, 8], "x": 13.75, "y": 5.333, "w": 1.25},
-
-                {"matrix": [7, 12], "x": 15.25, "y": 4.667, "h": 0.833},
-                {"matrix": [7, 14], "x": 15.75, "y": 5.5, "h": 0.833},
-                {"matrix": [7, 15], "x": 16.25, "y": 4.667, "h": 0.833},
-
-                {"matrix": [5, 15], "x": 17.5, "y": 5.333, "w": 2},
-                {"matrix": [5, 13], "x": 19.5, "y": 5.333}
-            ]
-        }
-    }
-}
diff --git a/keyboards/converter/periboard_512/keyboard.json b/keyboards/converter/periboard_512/keyboard.json
new file mode 100644
index 00000000000..b3359314931
--- /dev/null
+++ b/keyboards/converter/periboard_512/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Periboard 512",
+    "manufacturer": "Sife",
+    "url": "https://github.com/Sife-ops/qmk_firmware/tree/periboard_512/keyboards/converter/periboard_512",
+    "maintainer": "Sife-ops",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
+        "rows": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 7], "x": 0, "y": 0, "h": 0.833},
+
+                {"matrix": [0, 6], "x": 2, "y": 0, "h": 0.833},
+                {"matrix": [0, 5], "x": 3, "y": 0, "h": 0.833},
+                {"matrix": [4, 5], "x": 4, "y": 0, "h": 0.833},
+                {"matrix": [5, 5], "x": 5, "y": 0, "h": 0.833},
+                {"matrix": [5, 16], "x": 6, "y": 0, "h": 0.833},
+                {"matrix": [5, 3], "x": 7, "y": 0, "h": 0.833},
+                {"matrix": [4, 2], "x": 8, "y": 0, "h": 0.833},
+                {"matrix": [0, 2], "x": 9, "y": 0, "h": 0.833},
+                {"matrix": [0, 16], "x": 10, "y": 0, "h": 0.833},
+                {"matrix": [1, 16], "x": 11, "y": 0, "h": 0.833},
+                {"matrix": [1, 14], "x": 12, "y": 0, "h": 0.833},
+                {"matrix": [1, 15], "x": 13, "y": 0, "h": 0.833},
+                {"matrix": [1, 11], "x": 14.25, "y": 0, "h": 0.833},
+                {"matrix": [2, 11], "x": 15.25, "y": 0, "h": 0.833},
+                {"matrix": [6, 12], "x": 16.25, "y": 0, "h": 0.833},
+
+                {"matrix": [0, 7], "x": 0, "y": 1.333},
+                {"matrix": [1, 7], "x": 1, "y": 1.333},
+                {"matrix": [1, 6], "x": 2, "y": 1.333},
+                {"matrix": [1, 5], "x": 3, "y": 1.333},
+                {"matrix": [1, 10], "x": 4, "y": 1.333},
+                {"matrix": [0, 10], "x": 5, "y": 1.333},
+                {"matrix": [0, 18], "x": 6, "y": 1.333},
+                {"matrix": [1, 18], "x": 7, "y": 1.333},
+                {"matrix": [1, 3], "x": 8, "y": 1.333},
+                {"matrix": [1, 2], "x": 9, "y": 1.333},
+                {"matrix": [1, 1], "x": 10, "y": 1.333},
+                {"matrix": [0, 1], "x": 11, "y": 1.333},
+                {"matrix": [0, 3], "x": 12, "y": 1.333},
+                {"matrix": [4, 16], "x": 13, "y": 1.333, "w": 2},
+
+                {"matrix": [0, 15], "x": 16.25, "y": 3, "h": 0.833},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 1.333, "h": 0.833},
+                {"matrix": [0, 13], "x": 16.25, "y": 1.333, "h": 0.833},
+
+                {"matrix": [6, 14], "x": 17.5, "y": 1.333},
+                {"matrix": [6, 15], "x": 18.5, "y": 1.333},
+                {"matrix": [6, 13], "x": 19.5, "y": 1.333},
+                {"matrix": [7, 13], "x": 20.5, "y": 1.333},
+
+                {"matrix": [4, 7], "x": 0, "y": 2.333, "w": 1.5},
+                {"matrix": [2, 7], "x": 1.5, "y": 2.333},
+                {"matrix": [2, 6], "x": 2.5, "y": 2.333},
+                {"matrix": [2, 5], "x": 3.5, "y": 2.333},
+                {"matrix": [2, 10], "x": 4.5, "y": 2.333},
+                {"matrix": [4, 10], "x": 5.5, "y": 2.333},
+                {"matrix": [4, 4], "x": 6.5, "y": 2.333},
+                {"matrix": [2, 4], "x": 7.5, "y": 2.333},
+                {"matrix": [2, 3], "x": 8.5, "y": 2.333},
+                {"matrix": [2, 2], "x": 9.5, "y": 2.333},
+                {"matrix": [2, 1], "x": 10.5, "y": 2.333},
+                {"matrix": [4, 1], "x": 11.5, "y": 2.333},
+                {"matrix": [4, 3], "x": 12.5, "y": 2.333},
+                {"matrix": [3, 16], "x": 13.5, "y": 2.333, "w": 1.5},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 3, "h": 0.833},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 2.167, "h": 0.833},
+                {"matrix": [1, 13], "x": 16.25, "y": 2.167, "h": 0.833},
+
+                {"matrix": [2, 14], "x": 17.5, "y": 2.333},
+                {"matrix": [2, 15], "x": 18.5, "y": 2.333},
+                {"matrix": [2, 13], "x": 19.5, "y": 2.333},
+                {"matrix": [2, 12], "x": 20.5, "y": 2.333, "h": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3.333, "w": 1.75},
+                {"matrix": [3, 7], "x": 1.75, "y": 3.333},
+                {"matrix": [3, 6], "x": 2.75, "y": 3.333},
+                {"matrix": [3, 5], "x": 3.75, "y": 3.333},
+                {"matrix": [3, 10], "x": 4.75, "y": 3.333},
+                {"matrix": [5, 10], "x": 5.75, "y": 3.333},
+                {"matrix": [5, 4], "x": 6.75, "y": 3.333},
+                {"matrix": [3, 4], "x": 7.75, "y": 3.333},
+                {"matrix": [3, 3], "x": 8.75, "y": 3.333},
+                {"matrix": [3, 2], "x": 9.75, "y": 3.333},
+                {"matrix": [3, 1], "x": 10.75, "y": 3.333},
+                {"matrix": [5, 1], "x": 11.75, "y": 3.333},
+                {"matrix": [6, 16], "x": 12.75, "y": 3.333, "w": 2.25},
+
+                {"matrix": [4, 14], "x": 17.5, "y": 3.333},
+                {"matrix": [4, 15], "x": 18.5, "y": 3.333},
+                {"matrix": [4, 13], "x": 19.5, "y": 3.333},
+
+                {"matrix": [4, 9], "x": 0, "y": 4.333, "w": 2.25},
+                {"matrix": [6, 7], "x": 2.25, "y": 4.333},
+                {"matrix": [6, 6], "x": 3.25, "y": 4.333},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.333},
+                {"matrix": [6, 10], "x": 5.25, "y": 4.333},
+                {"matrix": [7, 10], "x": 6.25, "y": 4.333},
+                {"matrix": [7, 4], "x": 7.25, "y": 4.333},
+                {"matrix": [6, 4], "x": 8.25, "y": 4.333},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.333},
+                {"matrix": [6, 2], "x": 10.25, "y": 4.333},
+                {"matrix": [7, 1], "x": 11.25, "y": 4.333},
+                {"matrix": [6, 9], "x": 12.25, "y": 4.333, "w": 2.75},
+
+                {"matrix": [5, 12], "x": 15.75, "y": 3.833, "h": 0.833},
+
+                {"matrix": [3, 14], "x": 17.5, "y": 4.333},
+                {"matrix": [3, 15], "x": 18.5, "y": 4.333},
+                {"matrix": [3, 13], "x": 19.5, "y": 4.333},
+                {"matrix": [3, 12], "x": 20.5, "y": 4.333, "h": 2},
+
+                {"matrix": [0, 8], "x": 0, "y": 5.333, "w": 1.25},
+                {"matrix": [3, 17], "x": 1.25, "y": 5.333, "w": 1.25},
+                {"matrix": [5, 11], "x": 2.5, "y": 5.333, "w": 1.25},
+                {"matrix": [7, 16], "x": 3.75, "y": 5.333, "w": 6.25},
+                {"matrix": [7, 11], "x": 10, "y": 5.333, "w": 1.25},
+                {"matrix": [6, 0], "x": 11.25, "y": 5.333, "w": 1.25},
+                {"matrix": [2, 17], "x": 12.5, "y": 5.333, "w": 1.25},
+                {"matrix": [6, 8], "x": 13.75, "y": 5.333, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 4.667, "h": 0.833},
+                {"matrix": [7, 14], "x": 15.75, "y": 5.5, "h": 0.833},
+                {"matrix": [7, 15], "x": 16.25, "y": 4.667, "h": 0.833},
+
+                {"matrix": [5, 15], "x": 17.5, "y": 5.333, "w": 2},
+                {"matrix": [5, 13], "x": 19.5, "y": 5.333}
+            ]
+        }
+    }
+}
diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk
deleted file mode 100644
index 1eeda920b40..00000000000
--- a/keyboards/converter/periboard_512/rules.mk
+++ /dev/null
@@ -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 = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json
index 8ed2523c260..571d06a5c31 100644
--- a/keyboards/converter/siemens_tastatur/info.json
+++ b/keyboards/converter/siemens_tastatur/info.json
@@ -10,6 +10,15 @@
     },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "sleep_led": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c
index ea1aa2287e0..78054ee0fac 100644
--- a/keyboards/converter/siemens_tastatur/matrix.c
+++ b/keyboards/converter/siemens_tastatur/matrix.c
@@ -14,10 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include <string.h>
-#include "quantum.h"
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index 1bc8ee188b8..3215e3588a3 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -1,17 +1,2 @@
-SRC = matrix.c
-
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-SLEEP_LED_ENABLE = yes
 CUSTOM_MATRIX = yes
-
-
+SRC = matrix.c
diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json
index a243a64da25..e4031595ad3 100644
--- a/keyboards/converter/sun_usb/info.json
+++ b/keyboards/converter/sun_usb/info.json
@@ -9,5 +9,13 @@
       "device_version": "1.0.0"
     },
     "processor": "atmega32u4",
-    "bootloader": "lufa-dfu"
+    "bootloader": "lufa-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    }
 }
diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
index ae20f51b37e..d3ec00c5d5f 100644
--- a/keyboards/converter/sun_usb/rules.mk
+++ b/keyboards/converter/sun_usb/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 #HARDWARE_SERIAL = yes
 CUSTOM_MATRIX = yes
 
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index f5f751da14f..ca0855a82b9 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
-extern "C" {
-#include "quantum.h"
-}
-
 /* KEY CODE to Matrix
  *
  * HID keycode(1 byte):
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json
index 1c9bcf5e345..649b2833292 100644
--- a/keyboards/converter/xt_usb/info.json
+++ b/keyboards/converter/xt_usb/info.json
@@ -10,6 +10,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "halfkay",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_xt": {
             "layout": [
diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk
index f98bdcc5d35..3fd6b1cfa65 100644
--- a/keyboards/converter/xt_usb/rules.mk
+++ b/keyboards/converter/xt_usb/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c xt_interrupt.c
diff --git a/keyboards/converter/xt_usb/xt.h b/keyboards/converter/xt_usb/xt.h
index 538ff0e459f..e9c1c7751d8 100644
--- a/keyboards/converter/xt_usb/xt.h
+++ b/keyboards/converter/xt_usb/xt.h
@@ -38,7 +38,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 #define XT_DATA_IN()               \
     do {                           \
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json
index 82da2f800f7..1fb94c7052c 100644
--- a/keyboards/coseyfannitutti/discipline/info.json
+++ b/keyboards/coseyfannitutti/discipline/info.json
@@ -16,6 +16,11 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "layout_aliases": {
         "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker",
         "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker",
diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk
index 18550f0a64d..c2ee0bc86f9 100644
--- a/keyboards/coseyfannitutti/discipline/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json
index ff6e2de22b0..0d75d192293 100644
--- a/keyboards/coseyfannitutti/mysterium/info.json
+++ b/keyboards/coseyfannitutti/mysterium/info.json
@@ -15,6 +15,11 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32a",
     "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk
index b6082e107ce..c2ee0bc86f9 100644
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# 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/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 3a084b04baa..7636d9b702f 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -36,6 +36,12 @@
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk
index 78ff4d5d60e..baf23318ccd 100644
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ b/keyboards/cozykeys/speedo/v3/rules.mk
@@ -1,14 +1 @@
 PIN_COMPATIBLE = elite_c
-
-# 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 = 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/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index 23257be46e5..f88b7032086 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -20,6 +20,11 @@
     },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "layout_aliases": {
         "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all",
         "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all"
diff --git a/keyboards/crimsonkeyboards/resume1800/rules.mk b/keyboards/crimsonkeyboards/resume1800/rules.mk
index 18550f0a64d..c2ee0bc86f9 100644
--- a/keyboards/crimsonkeyboards/resume1800/rules.mk
+++ b/keyboards/crimsonkeyboards/resume1800/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c
index 2593ac5f8b7..8602134f699 100644
--- a/keyboards/crkbd/lib/host_led_state_reader.c
+++ b/keyboards/crkbd/lib/host_led_state_reader.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "led.h"
+#include "host.h"
 
 char host_led_state_str[24];
 
diff --git a/keyboards/crkbd/lib/keylogger.c b/keyboards/crkbd/lib/keylogger.c
index 9adb55d6eeb..84d2f8913db 100644
--- a/keyboards/crkbd/lib/keylogger.c
+++ b/keyboards/crkbd/lib/keylogger.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include <stdint.h>
+#include "action.h"
 
 char keylog_str[24] = {};
 char keylogs_str[21] = {};
diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c
index 7dd17024859..f1030cae099 100644
--- a/keyboards/crkbd/lib/layer_state_reader.c
+++ b/keyboards/crkbd/lib/layer_state_reader.c
@@ -1,5 +1,5 @@
-#include "quantum.h"
 #include <stdio.h>
+#include "action_layer.h"
 
 // in the future, should use (1U<<_LAYER_NAME) instead, but needs to be moved to keymap,c
 #define L_BASE 0
diff --git a/keyboards/crkbd/lib/logo_reader.c b/keyboards/crkbd/lib/logo_reader.c
index 4a710bb2502..039a538cc54 100644
--- a/keyboards/crkbd/lib/logo_reader.c
+++ b/keyboards/crkbd/lib/logo_reader.c
@@ -1,5 +1,3 @@
-#include "quantum.h"
-
 const char *read_logo(void) {
   static char logo[] = {
       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
diff --git a/keyboards/crkbd/lib/mode_icon_reader.c b/keyboards/crkbd/lib/mode_icon_reader.c
index 02a63ec1c60..9dadd6ac86b 100644
--- a/keyboards/crkbd/lib/mode_icon_reader.c
+++ b/keyboards/crkbd/lib/mode_icon_reader.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "quantum.h"
 
 char mode_icon[24];
 
diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c
index a255cd662d2..8ba0cda8df7 100644
--- a/keyboards/crkbd/lib/rgb_state_reader.c
+++ b/keyboards/crkbd/lib/rgb_state_reader.c
@@ -1,7 +1,7 @@
 #ifdef RGBLIGHT_ENABLE
 
 #include <stdio.h>
-#include "quantum.h"
+#include "rgblight.h"
 
 extern rgblight_config_t rgblight_config;
 char rbf_info_str[24];
diff --git a/keyboards/crkbd/lib/timelogger.c b/keyboards/crkbd/lib/timelogger.c
index bce9d99a4be..83fe9706ddc 100644
--- a/keyboards/crkbd/lib/timelogger.c
+++ b/keyboards/crkbd/lib/timelogger.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "timer.h"
 
 char timelog_str[24] = {};
 int last_time = 0;
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index 1b340ff74f6..e8771e363e6 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -31,6 +31,13 @@
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "direct": [
             ["B12", "B6", "B7"],
diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/crypt_macro/rules.mk
+++ b/keyboards/crypt_macro/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/custommk/evo70_r2/matrix.c b/keyboards/custommk/evo70_r2/matrix.c
index 99a23a4542e..99c3428d802 100644
--- a/keyboards/custommk/evo70_r2/matrix.c
+++ b/keyboards/custommk/evo70_r2/matrix.c
@@ -1,6 +1,7 @@
 // Copyright 2023 David Hoelscher (@customMK)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
+#include "matrix.h"
+#include <string.h>
 
 // Pin definitions
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/custommk/genesis/rev1/keyboard.json b/keyboards/custommk/genesis/rev1/keyboard.json
index f859a6b9bf3..7025834d91b 100644
--- a/keyboards/custommk/genesis/rev1/keyboard.json
+++ b/keyboards/custommk/genesis/rev1/keyboard.json
@@ -45,6 +45,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
     "layouts": {
         "LAYOUT_ortho_5x4": {
             "layout": [
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
deleted file mode 100644
index 5760ba52cdc..00000000000
--- a/keyboards/custommk/genesis/rev2/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Genesis Rev2",
-    "manufacturer": "customMK",
-    "url": "https://www.customMK.com",
-    "maintainer": "customMK",
-    "usb": {
-        "vid": "0xF35B",
-        "pid": "0xFAB1",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 13,
-        "max_brightness": 128,
-        "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
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "D7", "B4"],
-        "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
-            {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 10
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT_ortho_5x4": {
-            "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},
-
-                {"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}
-            ]
-        },
-        "LAYOUT_numpad_5x4": {
-            "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": [2, 0], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [2, 1], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
-
-                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 3], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/custommk/genesis/rev2/keyboard.json b/keyboards/custommk/genesis/rev2/keyboard.json
new file mode 100644
index 00000000000..d56cdb9df5e
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keyboard.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "Genesis Rev2",
+    "manufacturer": "customMK",
+    "url": "https://www.customMK.com",
+    "maintainer": "customMK",
+    "usb": {
+        "vid": "0xF35B",
+        "pid": "0xFAB1",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 13,
+        "max_brightness": 128,
+        "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
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "D7", "B4"],
+        "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
+            {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x4": {
+            "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},
+
+                {"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}
+            ]
+        },
+        "LAYOUT_numpad_5x4": {
+            "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": [2, 0], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk
deleted file mode 100644
index 212c267b251..00000000000
--- a/keyboards/custommk/genesis/rev2/rules.mk
+++ /dev/null
@@ -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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk
index cb164c1a89f..3d64c0af2b9 100644
--- a/keyboards/custommk/genesis/rules.mk
+++ b/keyboards/custommk/genesis/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
 DEFAULT_FOLDER = custommk/genesis/rev2
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
deleted file mode 100644
index 622e534864b..00000000000
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "claw44",
-    "manufacturer": "yfuku",
-    "url": "",
-    "maintainer": "yfuku",
-    "usb": {
-        "vid": "0x5946",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.18},
-                {"matrix": [0, 1], "x": 1, "y": 1.03},
-                {"matrix": [0, 2], "x": 2, "y": 0.35},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.05},
-                {"matrix": [0, 5], "x": 5, "y": 0.1},
-
-                {"matrix": [4, 5], "x": 11.5, "y": 0.1},
-                {"matrix": [4, 4], "x": 12.5, "y": 0.05},
-                {"matrix": [4, 3], "x": 13.5, "y": 0},
-                {"matrix": [4, 2], "x": 14.5, "y": 0.35},
-                {"matrix": [4, 1], "x": 15.5, "y": 1.08},
-                {"matrix": [4, 0], "x": 16.5, "y": 1.18},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.18},
-                {"matrix": [1, 1], "x": 1, "y": 2.03},
-                {"matrix": [1, 2], "x": 2, "y": 1.35},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.05},
-                {"matrix": [1, 5], "x": 5, "y": 1.1},
-
-                {"matrix": [5, 5], "x": 11.5, "y": 1.1},
-                {"matrix": [5, 4], "x": 12.5, "y": 1.05},
-                {"matrix": [5, 3], "x": 13.5, "y": 1},
-                {"matrix": [5, 2], "x": 14.5, "y": 1.35},
-                {"matrix": [5, 1], "x": 15.5, "y": 2.03},
-                {"matrix": [5, 0], "x": 16.5, "y": 2.18},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.18},
-                {"matrix": [2, 1], "x": 1, "y": 3.03},
-                {"matrix": [2, 2], "x": 2, "y": 2.35},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.05},
-                {"matrix": [2, 5], "x": 5, "y": 2.1},
-
-                {"matrix": [6, 5], "x": 11.5, "y": 2.1},
-                {"matrix": [6, 4], "x": 12.5, "y": 2.05},
-                {"matrix": [6, 3], "x": 13.5, "y": 2},
-                {"matrix": [6, 2], "x": 14.5, "y": 2.35},
-                {"matrix": [6, 1], "x": 15.5, "y": 3.03},
-                {"matrix": [6, 0], "x": 16.5, "y": 3.18},
-
-                {"matrix": [3, 2], "x": 4, "y": 3.05},
-                {"matrix": [3, 3], "x": 5, "y": 3.1},
-                {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25},
-
-                {"matrix": [3, 5], "x": 7.25, "y": 3.5},
-
-                {"matrix": [7, 5], "x": 9.25, "y": 3.5},
-                {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25},
-                {"matrix": [7, 3], "x": 11.5, "y": 3.1},
-                {"matrix": [7, 2], "x": 12.5, "y": 3.05}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dailycraft/claw44/rev1/keyboard.json b/keyboards/dailycraft/claw44/rev1/keyboard.json
new file mode 100644
index 00000000000..724cf5979fb
--- /dev/null
+++ b/keyboards/dailycraft/claw44/rev1/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "claw44",
+    "manufacturer": "yfuku",
+    "url": "",
+    "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.18},
+                {"matrix": [0, 1], "x": 1, "y": 1.03},
+                {"matrix": [0, 2], "x": 2, "y": 0.35},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.05},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [4, 5], "x": 11.5, "y": 0.1},
+                {"matrix": [4, 4], "x": 12.5, "y": 0.05},
+                {"matrix": [4, 3], "x": 13.5, "y": 0},
+                {"matrix": [4, 2], "x": 14.5, "y": 0.35},
+                {"matrix": [4, 1], "x": 15.5, "y": 1.08},
+                {"matrix": [4, 0], "x": 16.5, "y": 1.18},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.18},
+                {"matrix": [1, 1], "x": 1, "y": 2.03},
+                {"matrix": [1, 2], "x": 2, "y": 1.35},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.05},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [5, 5], "x": 11.5, "y": 1.1},
+                {"matrix": [5, 4], "x": 12.5, "y": 1.05},
+                {"matrix": [5, 3], "x": 13.5, "y": 1},
+                {"matrix": [5, 2], "x": 14.5, "y": 1.35},
+                {"matrix": [5, 1], "x": 15.5, "y": 2.03},
+                {"matrix": [5, 0], "x": 16.5, "y": 2.18},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.18},
+                {"matrix": [2, 1], "x": 1, "y": 3.03},
+                {"matrix": [2, 2], "x": 2, "y": 2.35},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.05},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [6, 5], "x": 11.5, "y": 2.1},
+                {"matrix": [6, 4], "x": 12.5, "y": 2.05},
+                {"matrix": [6, 3], "x": 13.5, "y": 2},
+                {"matrix": [6, 2], "x": 14.5, "y": 2.35},
+                {"matrix": [6, 1], "x": 15.5, "y": 3.03},
+                {"matrix": [6, 0], "x": 16.5, "y": 3.18},
+
+                {"matrix": [3, 2], "x": 4, "y": 3.05},
+                {"matrix": [3, 3], "x": 5, "y": 3.1},
+                {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25},
+
+                {"matrix": [3, 5], "x": 7.25, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9.25, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.5, "y": 3.1},
+                {"matrix": [7, 2], "x": 12.5, "y": 3.05}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dailycraft/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk
deleted file mode 100644
index a66eb7d352e..00000000000
--- a/keyboards/dailycraft/claw44/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-
-OLED_ENABLE = no     # Add OLED displays support
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk
index 6bc66a514a3..0344b3ee285 100644
--- a/keyboards/dailycraft/claw44/rules.mk
+++ b/keyboards/dailycraft/claw44/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-
 DEFAULT_FOLDER = dailycraft/claw44/rev1
diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json
index 8ff7c65a2f0..0a48996815e 100644
--- a/keyboards/dailycraft/sandbox/rev1/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json
@@ -15,6 +15,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "oled": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json
deleted file mode 100644
index 99535b94738..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "keyboard_name": "sandbox rev2",
-    "manufacturer": "yfuku",
-    "url": "",
-    "maintainer": "yfuku",
-    "usb": {
-        "vid": "0x5946",
-        "pid": "0x0011",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "B1", "B3", "B2", "B6"],
-        "rows": ["B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "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": [2, 0], "x": 6, "y": 0},
-                {"matrix": [2, 1], "x": 7, "y": 0},
-                {"matrix": [2, 2], "x": 8, "y": 0},
-                {"matrix": [2, 3], "x": 9, "y": 0},
-                {"matrix": [2, 4], "x": 10, "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": [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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dailycraft/sandbox/rev2/keyboard.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json
new file mode 100644
index 00000000000..d6f0ac2c2a5
--- /dev/null
+++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "keyboard_name": "sandbox rev2",
+    "manufacturer": "yfuku",
+    "url": "",
+    "maintainer": "yfuku",
+    "usb": {
+        "vid": "0x5946",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "oled": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [2, 0], "x": 6, "y": 0},
+                {"matrix": [2, 1], "x": 7, "y": 0},
+                {"matrix": [2, 2], "x": 8, "y": 0},
+                {"matrix": [2, 3], "x": 9, "y": 0},
+                {"matrix": [2, 4], "x": 10, "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": [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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dailycraft/sandbox/rev2/rules.mk b/keyboards/dailycraft/sandbox/rev2/rules.mk
deleted file mode 100644
index d38a6180907..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk
index 2afb4624d12..c62f01e18f5 100644
--- a/keyboards/dailycraft/sandbox/rules.mk
+++ b/keyboards/dailycraft/sandbox/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-
 DEFAULT_FOLDER = dailycraft/sandbox/rev2
diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json
index 657c8a9e512..a32b591bd6e 100644
--- a/keyboards/dailycraft/wings42/rev1/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1/keyboard.json
@@ -14,10 +14,16 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
     "community_layouts": [
         "split_3x6_3"
     ],
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
index 53db2db4ca6..ff665a3bb75 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
@@ -14,10 +14,16 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
    "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json
index a3c3e2396ef..13f283d92b3 100644
--- a/keyboards/dailycraft/wings42/rev2/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev2/keyboard.json
@@ -14,11 +14,9 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
-    "features": {
-      "encoder": true
-    },
     "encoder": {
         "rotary": [
             { "pin_a": "B5", "pin_b": "B4" },
@@ -27,6 +25,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true
+    },
     "layout_aliases": {
         "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
     },
diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk
index 9e762b19074..b027fec9b97 100644
--- a/keyboards/dailycraft/wings42/rules.mk
+++ b/keyboards/dailycraft/wings42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = dailycraft/wings42/rev2
diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c
index 78324c69426..0d426d3c9ac 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
index 78324c69426..0d426d3c9ac 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
index 4abb1bdc915..5f475caa1b6 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT_tkl_ansi(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
index 71fbfa4ff20..300855c452f 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
+++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_MOD,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                                RGB_VAI,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT_tkl_ansi(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json
similarity index 100%
rename from keyboards/dasky/reverb/info.json
rename to keyboards/dasky/reverb/keyboard.json
diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json
deleted file mode 100644
index 992b623d45c..00000000000
--- a/keyboards/dc01/arrow/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "keyboard_name": "DC01 Arrow",
-    "manufacturer": "Mechboards",
-    "url": "",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x1012",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dc01/arrow/keyboard.json b/keyboards/dc01/arrow/keyboard.json
new file mode 100644
index 00000000000..85ca25c23e8
--- /dev/null
+++ b/keyboards/dc01/arrow/keyboard.json
@@ -0,0 +1,39 @@
+{
+    "keyboard_name": "DC01 Arrow",
+    "manufacturer": "Mechboards",
+    "url": "",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x1012",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/arrow/rules.mk
+++ b/keyboards/dc01/arrow/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c
diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json
deleted file mode 100644
index 17fe3c64a28..00000000000
--- a/keyboards/dc01/left/info.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-    "keyboard_name": "DC01 Left",
-    "manufacturer": "Mechboards",
-    "url": "",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x1010",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 0,
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 5], "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, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [0, 20], "x": 21.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.25, "y": 1},
-                {"matrix": [1, 16], "x": 17.25, "y": 1},
-
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1},
-                {"matrix": [1, 20], "x": 21.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [2, 19], "x": 20.5, "y": 2},
-                {"matrix": [2, 20], "x": 21.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [3, 19], "x": 20.5, "y": 3},
-                {"matrix": [3, 20], "x": 21.5, "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, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4},
-                {"matrix": [4, 16], "x": 17.25, "y": 4},
-
-                {"matrix": [4, 17], "x": 18.5, "y": 4},
-                {"matrix": [4, 18], "x": 19.5, "y": 4},
-                {"matrix": [4, 19], "x": 20.5, "y": 4},
-                {"matrix": [4, 20], "x": 21.5, "y": 4}
-            ]
-        },
-        "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": [4, 5], "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, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-                {"matrix": [0, 18], "x": 19.5, "y": 0},
-                {"matrix": [0, 19], "x": 20.5, "y": 0},
-                {"matrix": [0, 20], "x": 21.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.25, "y": 1},
-                {"matrix": [1, 16], "x": 17.25, "y": 1},
-
-                {"matrix": [1, 17], "x": 18.5, "y": 1},
-                {"matrix": [1, 18], "x": 19.5, "y": 1},
-                {"matrix": [1, 19], "x": 20.5, "y": 1},
-                {"matrix": [1, 20], "x": 21.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [2, 17], "x": 18.5, "y": 2},
-                {"matrix": [2, 18], "x": 19.5, "y": 2},
-                {"matrix": [2, 19], "x": 20.5, "y": 2},
-                {"matrix": [2, 20], "x": 21.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 4], "x": 1.25, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 15], "x": 16.25, "y": 3},
-
-                {"matrix": [3, 17], "x": 18.5, "y": 3},
-                {"matrix": [3, 18], "x": 19.5, "y": 3},
-                {"matrix": [3, 19], "x": 20.5, "y": 3},
-                {"matrix": [3, 20], "x": 21.5, "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, 3], "x": 3.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4},
-                {"matrix": [4, 16], "x": 17.25, "y": 4},
-
-                {"matrix": [4, 17], "x": 18.5, "y": 4},
-                {"matrix": [4, 18], "x": 19.5, "y": 4},
-                {"matrix": [4, 19], "x": 20.5, "y": 4},
-                {"matrix": [4, 20], "x": 21.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dc01/left/keyboard.json b/keyboards/dc01/left/keyboard.json
new file mode 100644
index 00000000000..e2967909955
--- /dev/null
+++ b/keyboards/dc01/left/keyboard.json
@@ -0,0 +1,248 @@
+{
+    "keyboard_name": "DC01 Left",
+    "manufacturer": "Mechboards",
+    "url": "",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x1010",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "debounce": 0,
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 5], "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, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1},
+                {"matrix": [1, 20], "x": 21.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [2, 19], "x": 20.5, "y": 2},
+                {"matrix": [2, 20], "x": 21.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [3, 19], "x": 20.5, "y": 3},
+                {"matrix": [3, 20], "x": 21.5, "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, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4},
+                {"matrix": [4, 19], "x": 20.5, "y": 4},
+                {"matrix": [4, 20], "x": 21.5, "y": 4}
+            ]
+        },
+        "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": [4, 5], "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, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+                {"matrix": [0, 19], "x": 20.5, "y": 0},
+                {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+                {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+                {"matrix": [1, 19], "x": 20.5, "y": 1},
+                {"matrix": [1, 20], "x": 21.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 17], "x": 18.5, "y": 2},
+                {"matrix": [2, 18], "x": 19.5, "y": 2},
+                {"matrix": [2, 19], "x": 20.5, "y": 2},
+                {"matrix": [2, 20], "x": 21.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [3, 18], "x": 19.5, "y": 3},
+                {"matrix": [3, 19], "x": 20.5, "y": 3},
+                {"matrix": [3, 20], "x": 21.5, "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, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4},
+                {"matrix": [4, 16], "x": 17.25, "y": 4},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4},
+                {"matrix": [4, 18], "x": 19.5, "y": 4},
+                {"matrix": [4, 19], "x": 20.5, "y": 4},
+                {"matrix": [4, 20], "x": 21.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk
index 3a9422733c1..2493924f46a 100644
--- a/keyboards/dc01/left/rules.mk
+++ b/keyboards/dc01/left/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json
deleted file mode 100644
index eab2d0c33f4..00000000000
--- a/keyboards/dc01/numpad/info.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "keyboard_name": "DC01 Numpad",
-    "manufacturer": "Mechboards",
-    "url": "",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x1013",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["numpad_5x4", "ortho_5x4"],
-    "layouts": {
-        "LAYOUT_numpad_5x4": {
-            "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": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
-            ]
-        },
-        "LAYOUT_ortho_5x4": {
-            "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},
-
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dc01/numpad/keyboard.json b/keyboards/dc01/numpad/keyboard.json
new file mode 100644
index 00000000000..0cf73c23e33
--- /dev/null
+++ b/keyboards/dc01/numpad/keyboard.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "DC01 Numpad",
+    "manufacturer": "Mechboards",
+    "url": "",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x1013",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "community_layouts": ["numpad_5x4", "ortho_5x4"],
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "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": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "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},
+
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/numpad/rules.mk
+++ b/keyboards/dc01/numpad/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c
diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json
deleted file mode 100644
index 2b89117c44b..00000000000
--- a/keyboards/dc01/right/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "keyboard_name": "DC01 Right",
-    "manufacturer": "Mechboards",
-    "url": "",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x1011",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0.5, "y": 0},
-                {"matrix": [0, 2], "x": 1.5, "y": 0},
-                {"matrix": [0, 3], "x": 2.5, "y": 0},
-                {"matrix": [0, 4], "x": 3.5, "y": 0},
-                {"matrix": [0, 5], "x": 4.5, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0.5, "y": 0},
-                {"matrix": [0, 2], "x": 1.5, "y": 0},
-                {"matrix": [0, 3], "x": 2.5, "y": 0},
-                {"matrix": [0, 4], "x": 3.5, "y": 0},
-                {"matrix": [0, 5], "x": 4.5, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 7], "x": 6.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dc01/right/keyboard.json b/keyboards/dc01/right/keyboard.json
new file mode 100644
index 00000000000..6f48e05483e
--- /dev/null
+++ b/keyboards/dc01/right/keyboard.json
@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "DC01 Right",
+    "manufacturer": "Mechboards",
+    "url": "",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x1011",
+        "device_version": "0.0.1",
+        "no_startup_check": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0.5, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0.5, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 7], "x": 6.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index 04a6d03804e..f9b67381455 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -15,8 +15,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #if defined(__AVR__)
 #include <avr/io.h>
 #include <avr/wdt.h>
@@ -31,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "i2c_slave.h"
 #include "lufa.h"
-#include "quantum.h"
 
 #define SLAVE_I2C_ADDRESS 0x32
 
diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/right/rules.mk
+++ b/keyboards/dc01/right/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes         # Use custom matrix
+CUSTOM_MATRIX = yes
 SRC += matrix.c \
        i2c_slave.c
diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json
similarity index 100%
rename from keyboards/dcpedit/redherring/info.json
rename to keyboards/dcpedit/redherring/keyboard.json
diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json
index 67bec439f13..520cd92b09c 100644
--- a/keyboards/delikeeb/vanana/info.json
+++ b/keyboards/delikeeb/vanana/info.json
@@ -2,15 +2,6 @@
     "manufacturer": "dELIKEEb",
     "url": "",
     "maintainer": "noclew",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "usb": {
         "vid": "0x9906",
         "pid": "0x0013"
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
deleted file mode 100644
index a4c101ec237..00000000000
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "keyboard_name": "Vanana rev1",
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true
-        }
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
-        "rows": ["D2", "D7", "B4", "B5", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C7", "pin_b": "D5"},
-            {"pin_a": "F1", "pin_b": "F0"}
-        ]
-    },
-    "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": 9, "y": 0},
-                {"matrix": [0, 7], "x": 10, "y": 0},
-                {"matrix": [0, 8], "x": 11, "y": 0},
-                {"matrix": [0, 9], "x": 12, "y": 0},
-                {"matrix": [0, 10], "x": 13, "y": 0},
-                {"matrix": [0, 11], "x": 14, "y": 0},
-
-                {"matrix": [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": 9, "y": 1},
-                {"matrix": [1, 7], "x": 10, "y": 1},
-                {"matrix": [1, 8], "x": 11, "y": 1},
-                {"matrix": [1, 9], "x": 12, "y": 1},
-                {"matrix": [1, 10], "x": 13, "y": 1},
-                {"matrix": [1, 11], "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": [4, 0], "x": 7, "y": 2},
-
-                {"matrix": [2, 6], "x": 9, "y": 2},
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "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": [4, 11], "x": 7, "y": 3},
-
-                {"matrix": [3, 6], "x": 9, "y": 3},
-                {"matrix": [3, 7], "x": 10, "y": 3},
-                {"matrix": [3, 8], "x": 11, "y": 3},
-                {"matrix": [3, 9], "x": 12, "y": 3},
-                {"matrix": [3, 10], "x": 13, "y": 3},
-                {"matrix": [3, 11], "x": 14, "y": 3},
-
-                {"matrix": [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, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 11, "y": 4},
-                {"matrix": [4, 9], "x": 12, "y": 4},
-                {"matrix": [4, 10], "x": 13, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/delikeeb/vanana/rev1/keyboard.json b/keyboards/delikeeb/vanana/rev1/keyboard.json
new file mode 100644
index 00000000000..9ae59761de9
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev1/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Vanana rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
+        "rows": ["D2", "D7", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C7", "pin_b": "D5"},
+            {"pin_a": "F1", "pin_b": "F0"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "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": 9, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+
+                {"matrix": [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": 9, "y": 1},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1},
+                {"matrix": [1, 9], "x": 12, "y": 1},
+                {"matrix": [1, 10], "x": 13, "y": 1},
+                {"matrix": [1, 11], "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": [4, 0], "x": 7, "y": 2},
+
+                {"matrix": [2, 6], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "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": [4, 11], "x": 7, "y": 3},
+
+                {"matrix": [3, 6], "x": 9, "y": 3},
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+
+                {"matrix": [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, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 11, "y": 4},
+                {"matrix": [4, 9], "x": 12, "y": 4},
+                {"matrix": [4, 10], "x": 13, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/delikeeb/vanana/rev1/rules.mk b/keyboards/delikeeb/vanana/rev1/rules.mk
deleted file mode 100644
index eee766eca6c..00000000000
--- a/keyboards/delikeeb/vanana/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
deleted file mode 100644
index 252e111fb2a..00000000000
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "keyboard_name": "Vanana rev2",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
-        "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B6", "pin_b": "B2"},
-            {"pin_a": "F0", "pin_b": "F1"}
-        ]
-    },
-    "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": [5, 4], "x": 5, "y": 0},
-
-                {"matrix": [5, 9], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [0, 6], "x": 11, "y": 0},
-                {"matrix": [0, 7], "x": 12, "y": 0},
-                {"matrix": [0, 8], "x": 13, "y": 0},
-                {"matrix": [0, 9], "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": [5, 3], "x": 5, "y": 1},
-
-                {"matrix": [5, 8], "x": 9, "y": 1},
-                {"matrix": [1, 5], "x": 10, "y": 1},
-                {"matrix": [1, 6], "x": 11, "y": 1},
-                {"matrix": [1, 7], "x": 12, "y": 1},
-                {"matrix": [1, 8], "x": 13, "y": 1},
-                {"matrix": [1, 9], "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": [5, 2], "x": 5, "y": 2},
-
-                {"matrix": [5, 5], "x": 7, "y": 2},
-
-                {"matrix": [5, 7], "x": 9, "y": 2},
-                {"matrix": [2, 5], "x": 10, "y": 2},
-                {"matrix": [2, 6], "x": 11, "y": 2},
-                {"matrix": [2, 7], "x": 12, "y": 2},
-                {"matrix": [2, 8], "x": 13, "y": 2},
-                {"matrix": [2, 9], "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": [5, 1], "x": 5, "y": 3},
-
-                {"matrix": [5, 0], "x": 7, "y": 3},
-
-                {"matrix": [5, 6], "x": 9, "y": 3},
-                {"matrix": [3, 5], "x": 10, "y": 3},
-                {"matrix": [3, 6], "x": 11, "y": 3},
-                {"matrix": [3, 7], "x": 12, "y": 3},
-                {"matrix": [3, 8], "x": 13, "y": 3},
-                {"matrix": [3, 9], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 1, "y": 4},
-                {"matrix": [4, 1], "x": 2, "y": 4},
-                {"matrix": [4, 2], "x": 3, "y": 4},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 11, "y": 4},
-                {"matrix": [4, 8], "x": 12, "y": 4},
-                {"matrix": [4, 9], "x": 13, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/delikeeb/vanana/rev2/keyboard.json b/keyboards/delikeeb/vanana/rev2/keyboard.json
new file mode 100644
index 00000000000..a15ad3e71a3
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev2/keyboard.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "Vanana rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
+        "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B6", "pin_b": "B2"},
+            {"pin_a": "F0", "pin_b": "F1"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "audio": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [5, 4], "x": 5, "y": 0},
+
+                {"matrix": [5, 9], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [0, 6], "x": 11, "y": 0},
+                {"matrix": [0, 7], "x": 12, "y": 0},
+                {"matrix": [0, 8], "x": 13, "y": 0},
+                {"matrix": [0, 9], "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": [5, 3], "x": 5, "y": 1},
+
+                {"matrix": [5, 8], "x": 9, "y": 1},
+                {"matrix": [1, 5], "x": 10, "y": 1},
+                {"matrix": [1, 6], "x": 11, "y": 1},
+                {"matrix": [1, 7], "x": 12, "y": 1},
+                {"matrix": [1, 8], "x": 13, "y": 1},
+                {"matrix": [1, 9], "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": [5, 2], "x": 5, "y": 2},
+
+                {"matrix": [5, 5], "x": 7, "y": 2},
+
+                {"matrix": [5, 7], "x": 9, "y": 2},
+                {"matrix": [2, 5], "x": 10, "y": 2},
+                {"matrix": [2, 6], "x": 11, "y": 2},
+                {"matrix": [2, 7], "x": 12, "y": 2},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "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": [5, 1], "x": 5, "y": 3},
+
+                {"matrix": [5, 0], "x": 7, "y": 3},
+
+                {"matrix": [5, 6], "x": 9, "y": 3},
+                {"matrix": [3, 5], "x": 10, "y": 3},
+                {"matrix": [3, 6], "x": 11, "y": 3},
+                {"matrix": [3, 7], "x": 12, "y": 3},
+                {"matrix": [3, 8], "x": 13, "y": 3},
+                {"matrix": [3, 9], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 9], "x": 13, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/delikeeb/vanana/rev2/rules.mk b/keyboards/delikeeb/vanana/rev2/rules.mk
deleted file mode 100644
index 8bb6ab5d91c..00000000000
--- a/keyboards/delikeeb/vanana/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
deleted file mode 100644
index 042c41f34d6..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
new file mode 100644
index 00000000000..44fd177e020
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
@@ -0,0 +1,14 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "encoder": true
+    }
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
deleted file mode 100644
index 307296b1bae..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# supported on Elite-C controllers
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes        # Enable Rotary Encoder
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 1f9a8124a96..1201411d46b 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -22,14 +22,6 @@
     "ws2812": {
         "pin": "C7"
     },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
     "matrix_pins": {
         "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
         "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"]
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
deleted file mode 100644
index 4369a041038..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
-}
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
new file mode 100644
index 00000000000..a97bf794ea1
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
@@ -0,0 +1,12 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    }
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
deleted file mode 100644
index 17c9907319d..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# not supported on Pro Micro controllers
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-ENCODER_ENABLE = no         # Enable Rotary Encoder
diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk
index 8285c29cb78..ee888337e5e 100644
--- a/keyboards/deltasplit75/rules.mk
+++ b/keyboards/deltasplit75/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = 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
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = deltasplit75/v2
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
deleted file mode 100644
index d583f3bb65b..00000000000
--- a/keyboards/deltasplit75/v2/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "keyboard_name": "DeltaSplit75",
-    "manufacturer": "xyxjj",
-    "maintainer": "xyxjj & itsaferbie",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x3060",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-      "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"],
-      "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-      "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-      "led_count": 12
-    },
-    "ws2812": {
-      "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-      "LAYOUT_v2": {
-        "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": [7, 0], "x": 8, "y": 0},
-          {"matrix": [7, 1], "x": 9, "y": 0},
-          {"matrix": [7, 2], "x": 10, "y": 0},
-          {"matrix": [7, 3], "x": 11, "y": 0},
-          {"matrix": [7, 4], "x": 12, "y": 0},
-          {"matrix": [7, 5], "x": 13, "y": 0},
-          {"matrix": [7, 6], "x": 14, "y": 0},
-          {"matrix": [7, 7], "x": 15, "y": 0},
-          {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
-          {"matrix": [8, 1], "x": 9, "y": 1},
-          {"matrix": [8, 2], "x": 10, "y": 1},
-          {"matrix": [8, 3], "x": 11, "y": 1},
-          {"matrix": [8, 4], "x": 12, "y": 1},
-          {"matrix": [8, 5], "x": 13, "y": 1},
-          {"matrix": [8, 6], "x": 14, "y": 1},
-          {"matrix": [8, 7], "x": 15, "y": 1},
-          {"matrix": [13, 3], "x": 16, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-          {"matrix": [2, 1], "x": 1.5, "y": 2},
-          {"matrix": [2, 2], "x": 2.5, "y": 2},
-          {"matrix": [2, 3], "x": 3.5, "y": 2},
-          {"matrix": [2, 4], "x": 4.5, "y": 2},
-          {"matrix": [2, 5], "x": 5.5, "y": 2},
-          {"matrix": [9, 0], "x": 7.5, "y": 2},
-          {"matrix": [9, 1], "x": 8.5, "y": 2},
-          {"matrix": [9, 2], "x": 9.5, "y": 2},
-          {"matrix": [9, 3], "x": 10.5, "y": 2},
-          {"matrix": [9, 4], "x": 11.5, "y": 2},
-          {"matrix": [9, 5], "x": 12.5, "y": 2},
-          {"matrix": [9, 6], "x": 13.5, "y": 2},
-          {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
-          {"matrix": [13, 4], "x": 16, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-          {"matrix": [3, 1], "x": 1.75, "y": 3},
-          {"matrix": [3, 2], "x": 2.75, "y": 3},
-          {"matrix": [3, 3], "x": 3.75, "y": 3},
-          {"matrix": [3, 4], "x": 4.75, "y": 3},
-          {"matrix": [3, 5], "x": 5.75, "y": 3},
-          {"matrix": [10, 0], "x": 7.75, "y": 3},
-          {"matrix": [10, 1], "x": 8.75, "y": 3},
-          {"matrix": [10, 2], "x": 9.75, "y": 3},
-          {"matrix": [10, 3], "x": 10.75, "y": 3},
-          {"matrix": [10, 4], "x": 11.75, "y": 3},
-          {"matrix": [10, 5], "x": 12.75, "y": 3},
-          {"matrix": [10, 6], "x": 13.75, "y": 3},
-          {"matrix": [10, 7], "x": 14.75, "y": 3, "w": 1.25},
-          {"matrix": [13, 5], "x": 16, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          {"matrix": [5, 3], "x": 1.25, "y": 4},
-          {"matrix": [4, 1], "x": 2.25, "y": 4},
-          {"matrix": [4, 2], "x": 3.25, "y": 4},
-          {"matrix": [4, 3], "x": 4.25, "y": 4},
-          {"matrix": [4, 4], "x": 5.25, "y": 4},
-          {"matrix": [4, 5], "x": 6.25, "y": 4},
-          {"matrix": [11, 0], "x": 7.25, "y": 4},
-          {"matrix": [11, 1], "x": 8.25, "y": 4},
-          {"matrix": [11, 2], "x": 9.25, "y": 4},
-          {"matrix": [11, 3], "x": 10.25, "y": 4},
-          {"matrix": [11, 4], "x": 11.25, "y": 4},
-          {"matrix": [11, 5], "x": 12.25, "y": 4},
-          {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
-          {"matrix": [11, 7], "x": 15, "y": 4},
-          {"matrix": [13, 6], "x": 16, "y": 4},
-
-          {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-          {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-          {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-          {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
-          {"matrix": [5, 5], "x": 5.75, "y": 5},
-          {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
-          {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
-          {"matrix": [12, 2], "x": 11.75, "y": 5},
-          {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
-          {"matrix": [12, 6], "x": 14, "y": 5},
-          {"matrix": [12, 7], "x": 15, "y": 5},
-          {"matrix": [13, 7], "x": 16, "y": 5}
-        ]
-      },
-      "LAYOUT_protosplit": {
-        "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": [7, 0], "x": 8, "y": 0},
-          {"matrix": [7, 1], "x": 9, "y": 0},
-          {"matrix": [7, 2], "x": 10, "y": 0},
-          {"matrix": [7, 3], "x": 11, "y": 0},
-          {"matrix": [7, 4], "x": 12, "y": 0},
-          {"matrix": [7, 5], "x": 13, "y": 0},
-          {"matrix": [7, 6], "x": 14, "y": 0},
-          {"matrix": [7, 7], "x": 15, "y": 0},
-          {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
-          {"matrix": [8, 1], "x": 9, "y": 1},
-          {"matrix": [8, 2], "x": 10, "y": 1},
-          {"matrix": [8, 3], "x": 11, "y": 1},
-          {"matrix": [8, 4], "x": 12, "y": 1},
-          {"matrix": [8, 5], "x": 13, "y": 1},
-          {"matrix": [8, 6], "x": 14, "y": 1},
-          {"matrix": [8, 7], "x": 15, "y": 1},
-          {"matrix": [13, 3], "x": 16, "y": 1},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-          {"matrix": [2, 1], "x": 1.5, "y": 2},
-          {"matrix": [2, 2], "x": 2.5, "y": 2},
-          {"matrix": [2, 3], "x": 3.5, "y": 2},
-          {"matrix": [2, 4], "x": 4.5, "y": 2},
-          {"matrix": [2, 5], "x": 5.5, "y": 2},
-
-          {"matrix": [9, 0], "x": 7.5, "y": 2},
-          {"matrix": [9, 1], "x": 8.5, "y": 2},
-          {"matrix": [9, 2], "x": 9.5, "y": 2},
-          {"matrix": [9, 3], "x": 10.5, "y": 2},
-          {"matrix": [9, 4], "x": 11.5, "y": 2},
-          {"matrix": [9, 5], "x": 12.5, "y": 2},
-          {"matrix": [9, 6], "x": 13.5, "y": 2},
-          {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
-          {"matrix": [13, 4], "x": 16, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-          {"matrix": [3, 1], "x": 1.75, "y": 3},
-          {"matrix": [3, 2], "x": 2.75, "y": 3},
-          {"matrix": [3, 3], "x": 3.75, "y": 3},
-          {"matrix": [3, 4], "x": 4.75, "y": 3},
-          {"matrix": [3, 5], "x": 5.75, "y": 3},
-
-          {"matrix": [10, 0], "x": 7.75, "y": 3},
-          {"matrix": [10, 1], "x": 8.75, "y": 3},
-          {"matrix": [10, 2], "x": 9.75, "y": 3},
-          {"matrix": [10, 3], "x": 10.75, "y": 3},
-          {"matrix": [10, 4], "x": 11.75, "y": 3},
-          {"matrix": [10, 5], "x": 12.75, "y": 3},
-          {"matrix": [10, 7], "x": 13.75, "y": 3, "w": 2.25},
-          {"matrix": [13, 5], "x": 16, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-          {"matrix": [4, 1], "x": 2.25, "y": 4},
-          {"matrix": [4, 2], "x": 3.25, "y": 4},
-          {"matrix": [4, 3], "x": 4.25, "y": 4},
-          {"matrix": [4, 4], "x": 5.25, "y": 4},
-          {"matrix": [4, 5], "x": 6.25, "y": 4},
-
-          {"matrix": [11, 0], "x": 7.25, "y": 4},
-          {"matrix": [11, 1], "x": 8.25, "y": 4},
-          {"matrix": [11, 2], "x": 9.25, "y": 4},
-          {"matrix": [11, 3], "x": 10.25, "y": 4},
-          {"matrix": [11, 4], "x": 11.25, "y": 4},
-          {"matrix": [11, 5], "x": 12.25, "y": 4},
-          {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
-          {"matrix": [11, 7], "x": 15, "y": 4},
-          {"matrix": [13, 6], "x": 16, "y": 4},
-
-          {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-          {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-          {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-          {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
-          {"matrix": [5, 5], "x": 5.75, "y": 5},
-
-          {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
-          {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
-          {"matrix": [12, 2], "x": 11.75, "y": 5},
-          {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
-          {"matrix": [12, 6], "x": 14, "y": 5},
-          {"matrix": [12, 7], "x": 15, "y": 5},
-          {"matrix": [13, 7], "x": 16, "y": 5}
-        ]
-      }
-    }
-}
diff --git a/keyboards/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json
new file mode 100644
index 00000000000..2c1968e0b59
--- /dev/null
+++ b/keyboards/deltasplit75/v2/keyboard.json
@@ -0,0 +1,237 @@
+{
+    "keyboard_name": "DeltaSplit75",
+    "manufacturer": "xyxjj",
+    "maintainer": "xyxjj & itsaferbie",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x3060",
+      "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+      "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"],
+      "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+      "enabled": true,
+      "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+      "led_count": 12
+    },
+    "ws2812": {
+      "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true
+    },
+    "layouts": {
+      "LAYOUT_v2": {
+        "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": [7, 0], "x": 8, "y": 0},
+          {"matrix": [7, 1], "x": 9, "y": 0},
+          {"matrix": [7, 2], "x": 10, "y": 0},
+          {"matrix": [7, 3], "x": 11, "y": 0},
+          {"matrix": [7, 4], "x": 12, "y": 0},
+          {"matrix": [7, 5], "x": 13, "y": 0},
+          {"matrix": [7, 6], "x": 14, "y": 0},
+          {"matrix": [7, 7], "x": 15, "y": 0},
+          {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+          {"matrix": [8, 1], "x": 9, "y": 1},
+          {"matrix": [8, 2], "x": 10, "y": 1},
+          {"matrix": [8, 3], "x": 11, "y": 1},
+          {"matrix": [8, 4], "x": 12, "y": 1},
+          {"matrix": [8, 5], "x": 13, "y": 1},
+          {"matrix": [8, 6], "x": 14, "y": 1},
+          {"matrix": [8, 7], "x": 15, "y": 1},
+          {"matrix": [13, 3], "x": 16, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2},
+          {"matrix": [2, 2], "x": 2.5, "y": 2},
+          {"matrix": [2, 3], "x": 3.5, "y": 2},
+          {"matrix": [2, 4], "x": 4.5, "y": 2},
+          {"matrix": [2, 5], "x": 5.5, "y": 2},
+          {"matrix": [9, 0], "x": 7.5, "y": 2},
+          {"matrix": [9, 1], "x": 8.5, "y": 2},
+          {"matrix": [9, 2], "x": 9.5, "y": 2},
+          {"matrix": [9, 3], "x": 10.5, "y": 2},
+          {"matrix": [9, 4], "x": 11.5, "y": 2},
+          {"matrix": [9, 5], "x": 12.5, "y": 2},
+          {"matrix": [9, 6], "x": 13.5, "y": 2},
+          {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+          {"matrix": [13, 4], "x": 16, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+          {"matrix": [3, 1], "x": 1.75, "y": 3},
+          {"matrix": [3, 2], "x": 2.75, "y": 3},
+          {"matrix": [3, 3], "x": 3.75, "y": 3},
+          {"matrix": [3, 4], "x": 4.75, "y": 3},
+          {"matrix": [3, 5], "x": 5.75, "y": 3},
+          {"matrix": [10, 0], "x": 7.75, "y": 3},
+          {"matrix": [10, 1], "x": 8.75, "y": 3},
+          {"matrix": [10, 2], "x": 9.75, "y": 3},
+          {"matrix": [10, 3], "x": 10.75, "y": 3},
+          {"matrix": [10, 4], "x": 11.75, "y": 3},
+          {"matrix": [10, 5], "x": 12.75, "y": 3},
+          {"matrix": [10, 6], "x": 13.75, "y": 3},
+          {"matrix": [10, 7], "x": 14.75, "y": 3, "w": 1.25},
+          {"matrix": [13, 5], "x": 16, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [5, 3], "x": 1.25, "y": 4},
+          {"matrix": [4, 1], "x": 2.25, "y": 4},
+          {"matrix": [4, 2], "x": 3.25, "y": 4},
+          {"matrix": [4, 3], "x": 4.25, "y": 4},
+          {"matrix": [4, 4], "x": 5.25, "y": 4},
+          {"matrix": [4, 5], "x": 6.25, "y": 4},
+          {"matrix": [11, 0], "x": 7.25, "y": 4},
+          {"matrix": [11, 1], "x": 8.25, "y": 4},
+          {"matrix": [11, 2], "x": 9.25, "y": 4},
+          {"matrix": [11, 3], "x": 10.25, "y": 4},
+          {"matrix": [11, 4], "x": 11.25, "y": 4},
+          {"matrix": [11, 5], "x": 12.25, "y": 4},
+          {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+          {"matrix": [11, 7], "x": 15, "y": 4},
+          {"matrix": [13, 6], "x": 16, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+          {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+          {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+          {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
+          {"matrix": [5, 5], "x": 5.75, "y": 5},
+          {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+          {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+          {"matrix": [12, 2], "x": 11.75, "y": 5},
+          {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+          {"matrix": [12, 6], "x": 14, "y": 5},
+          {"matrix": [12, 7], "x": 15, "y": 5},
+          {"matrix": [13, 7], "x": 16, "y": 5}
+        ]
+      },
+      "LAYOUT_protosplit": {
+        "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": [7, 0], "x": 8, "y": 0},
+          {"matrix": [7, 1], "x": 9, "y": 0},
+          {"matrix": [7, 2], "x": 10, "y": 0},
+          {"matrix": [7, 3], "x": 11, "y": 0},
+          {"matrix": [7, 4], "x": 12, "y": 0},
+          {"matrix": [7, 5], "x": 13, "y": 0},
+          {"matrix": [7, 6], "x": 14, "y": 0},
+          {"matrix": [7, 7], "x": 15, "y": 0},
+          {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+          {"matrix": [8, 1], "x": 9, "y": 1},
+          {"matrix": [8, 2], "x": 10, "y": 1},
+          {"matrix": [8, 3], "x": 11, "y": 1},
+          {"matrix": [8, 4], "x": 12, "y": 1},
+          {"matrix": [8, 5], "x": 13, "y": 1},
+          {"matrix": [8, 6], "x": 14, "y": 1},
+          {"matrix": [8, 7], "x": 15, "y": 1},
+          {"matrix": [13, 3], "x": 16, "y": 1},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2},
+          {"matrix": [2, 2], "x": 2.5, "y": 2},
+          {"matrix": [2, 3], "x": 3.5, "y": 2},
+          {"matrix": [2, 4], "x": 4.5, "y": 2},
+          {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+          {"matrix": [9, 0], "x": 7.5, "y": 2},
+          {"matrix": [9, 1], "x": 8.5, "y": 2},
+          {"matrix": [9, 2], "x": 9.5, "y": 2},
+          {"matrix": [9, 3], "x": 10.5, "y": 2},
+          {"matrix": [9, 4], "x": 11.5, "y": 2},
+          {"matrix": [9, 5], "x": 12.5, "y": 2},
+          {"matrix": [9, 6], "x": 13.5, "y": 2},
+          {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+          {"matrix": [13, 4], "x": 16, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+          {"matrix": [3, 1], "x": 1.75, "y": 3},
+          {"matrix": [3, 2], "x": 2.75, "y": 3},
+          {"matrix": [3, 3], "x": 3.75, "y": 3},
+          {"matrix": [3, 4], "x": 4.75, "y": 3},
+          {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+          {"matrix": [10, 0], "x": 7.75, "y": 3},
+          {"matrix": [10, 1], "x": 8.75, "y": 3},
+          {"matrix": [10, 2], "x": 9.75, "y": 3},
+          {"matrix": [10, 3], "x": 10.75, "y": 3},
+          {"matrix": [10, 4], "x": 11.75, "y": 3},
+          {"matrix": [10, 5], "x": 12.75, "y": 3},
+          {"matrix": [10, 7], "x": 13.75, "y": 3, "w": 2.25},
+          {"matrix": [13, 5], "x": 16, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+          {"matrix": [4, 1], "x": 2.25, "y": 4},
+          {"matrix": [4, 2], "x": 3.25, "y": 4},
+          {"matrix": [4, 3], "x": 4.25, "y": 4},
+          {"matrix": [4, 4], "x": 5.25, "y": 4},
+          {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+          {"matrix": [11, 0], "x": 7.25, "y": 4},
+          {"matrix": [11, 1], "x": 8.25, "y": 4},
+          {"matrix": [11, 2], "x": 9.25, "y": 4},
+          {"matrix": [11, 3], "x": 10.25, "y": 4},
+          {"matrix": [11, 4], "x": 11.25, "y": 4},
+          {"matrix": [11, 5], "x": 12.25, "y": 4},
+          {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+          {"matrix": [11, 7], "x": 15, "y": 4},
+          {"matrix": [13, 6], "x": 16, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+          {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+          {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+          {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
+          {"matrix": [5, 5], "x": 5.75, "y": 5},
+
+          {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+          {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+          {"matrix": [12, 2], "x": 11.75, "y": 5},
+          {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+          {"matrix": [12, 6], "x": 14, "y": 5},
+          {"matrix": [12, 7], "x": 15, "y": 5},
+          {"matrix": [13, 7], "x": 16, "y": 5}
+        ]
+      }
+    }
+}
diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/deltasplit75/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
deleted file mode 100644
index 8e594cccb9c..00000000000
--- a/keyboards/deng/thirty/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "Thirty",
-    "manufacturer": "Leo Deng",
-    "url": "",
-    "maintainer": "myst729",
-    "usb": {
-        "vid": "0xDE29",
-        "pid": "0x7342",
-        "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,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_moving_chevron": 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_flow": 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": "cycle_all"
-        },
-        "driver": "ws2812",
-        "max_brightness": 200
-    },
-    "matrix_pins": {
-        "cols": ["B13", "B14", "B3", "A4", "A6"],
-        "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
-    },
-    "diode_direction": "COL2ROW",
-    "dynamic_keymap": {
-        "layer_count": 8
-    },
-    "backlight": {
-        "pin": "B11",
-        "levels": 5,
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "B12"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "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": [3, 4], "x": 5, "y": 0},
-                {"matrix": [3, 3], "x": 6, "y": 0},
-                {"matrix": [3, 2], "x": 7, "y": 0},
-                {"matrix": [3, 1], "x": 8, "y": 0},
-                {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1},
-                {"matrix": [4, 3], "x": 6, "y": 1},
-                {"matrix": [4, 2], "x": 7, "y": 1},
-                {"matrix": [4, 1], "x": 8, "y": 1},
-                {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2},
-                {"matrix": [5, 3], "x": 6, "y": 2},
-                {"matrix": [5, 2], "x": 7, "y": 2},
-                {"matrix": [5, 1], "x": 8, "y": 2},
-                {"matrix": [5, 0], "x": 9, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/deng/thirty/keyboard.json b/keyboards/deng/thirty/keyboard.json
new file mode 100644
index 00000000000..a26d727f12b
--- /dev/null
+++ b/keyboards/deng/thirty/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Thirty",
+    "manufacturer": "Leo Deng",
+    "url": "",
+    "maintainer": "myst729",
+    "usb": {
+        "vid": "0xDE29",
+        "pid": "0x7342",
+        "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,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_moving_chevron": 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_flow": 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": "cycle_all"
+        },
+        "driver": "ws2812",
+        "max_brightness": 200
+    },
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B3", "A4", "A6"],
+        "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 8
+    },
+    "backlight": {
+        "pin": "B11",
+        "levels": 5,
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "B12"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true,
+        "rgb_matrix": true
+    },
+    "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": [3, 4], "x": 5, "y": 0},
+                {"matrix": [3, 3], "x": 6, "y": 0},
+                {"matrix": [3, 2], "x": 7, "y": 0},
+                {"matrix": [3, 1], "x": 8, "y": 0},
+                {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1},
+                {"matrix": [4, 3], "x": 6, "y": 1},
+                {"matrix": [4, 2], "x": 7, "y": 1},
+                {"matrix": [4, 1], "x": 8, "y": 1},
+                {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [5, 1], "x": 8, "y": 2},
+                {"matrix": [5, 0], "x": 9, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk
index d1753c1e6c4..04fe1eba2ac 100644
--- a/keyboards/deng/thirty/rules.mk
+++ b/keyboards/deng/thirty/rules.mk
@@ -1,15 +1,2 @@
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-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
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json
deleted file mode 100644
index 1b2d9a29c9b..00000000000
--- a/keyboards/dichotomy/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "keyboard_name": "Dichotomy",
-  "manufacturer": "Broekhuijsen",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0xACC7",
-    "device_version": "0.0.2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.5},
-        {"matrix": [0, 1], "x": 1, "y": 0.5},
-        {"matrix": [0, 2], "x": 2, "y": 0.25},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.5},
-        {"matrix": [0, 5], "x": 5, "y": 0.5},
-
-        {"matrix": [0, 6], "x": 7, "y": 0.5},
-        {"matrix": [0, 7], "x": 8, "y": 0.5},
-        {"matrix": [0, 8], "x": 9, "y": 0},
-        {"matrix": [0, 9], "x": 10, "y": 0.25},
-        {"matrix": [0, 10], "x": 11, "y": 0.5},
-        {"matrix": [0, 11], "x": 12, "y": 0.5},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.5},
-        {"matrix": [1, 1], "x": 1, "y": 1.5},
-        {"matrix": [1, 2], "x": 2, "y": 1.25},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.5},
-        {"matrix": [1, 5], "x": 5, "y": 1.5},
-
-        {"matrix": [1, 6], "x": 7, "y": 1.5},
-        {"matrix": [1, 7], "x": 8, "y": 1.5},
-        {"matrix": [1, 8], "x": 9, "y": 1},
-        {"matrix": [1, 9], "x": 10, "y": 1.25},
-        {"matrix": [1, 10], "x": 11, "y": 1.5},
-        {"matrix": [1, 11], "x": 12, "y": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.5},
-        {"matrix": [2, 1], "x": 1, "y": 2.5},
-        {"matrix": [2, 2], "x": 2, "y": 2.25},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.5},
-        {"matrix": [2, 5], "x": 5, "y": 2.5},
-
-        {"matrix": [2, 6], "x": 7, "y": 2.5},
-        {"matrix": [2, 7], "x": 8, "y": 2.5},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2.25},
-        {"matrix": [2, 10], "x": 11, "y": 2.5},
-        {"matrix": [2, 11], "x": 12, "y": 2.5},
-
-        {"matrix": [3, 3], "x": 3, "y": 4},
-        {"matrix": [3, 4], "x": 4, "y": 4},
-        {"matrix": [3, 5], "x": 5, "y": 4},
-
-        {"matrix": [3, 6], "x": 7, "y": 4},
-        {"matrix": [3, 7], "x": 8, "y": 4},
-        {"matrix": [3, 8], "x": 9, "y": 4},
-
-        {"matrix": [4, 2], "x": 2, "y": 5},
-        {"matrix": [4, 3], "x": 3, "y": 5},
-        {"matrix": [4, 4], "x": 4, "y": 5},
-        {"matrix": [4, 5], "x": 5, "y": 5},
-
-        {"matrix": [4, 6], "x": 7, "y": 5},
-        {"matrix": [4, 7], "x": 8, "y": 5},
-        {"matrix": [4, 8], "x": 9, "y": 5},
-        {"matrix": [4, 9], "x": 10, "y": 5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/dichotomy/keyboard.json b/keyboards/dichotomy/keyboard.json
new file mode 100644
index 00000000000..bc3546a0829
--- /dev/null
+++ b/keyboards/dichotomy/keyboard.json
@@ -0,0 +1,87 @@
+{
+  "keyboard_name": "Dichotomy",
+  "manufacturer": "Broekhuijsen",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xACC7",
+    "device_version": "0.0.2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true,
+    "pointing_device": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.5},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.5},
+        {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+        {"matrix": [0, 6], "x": 7, "y": 0.5},
+        {"matrix": [0, 7], "x": 8, "y": 0.5},
+        {"matrix": [0, 8], "x": 9, "y": 0},
+        {"matrix": [0, 9], "x": 10, "y": 0.25},
+        {"matrix": [0, 10], "x": 11, "y": 0.5},
+        {"matrix": [0, 11], "x": 12, "y": 0.5},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+        {"matrix": [1, 6], "x": 7, "y": 1.5},
+        {"matrix": [1, 7], "x": 8, "y": 1.5},
+        {"matrix": [1, 8], "x": 9, "y": 1},
+        {"matrix": [1, 9], "x": 10, "y": 1.25},
+        {"matrix": [1, 10], "x": 11, "y": 1.5},
+        {"matrix": [1, 11], "x": 12, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.5},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.5},
+        {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+        {"matrix": [2, 6], "x": 7, "y": 2.5},
+        {"matrix": [2, 7], "x": 8, "y": 2.5},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2.25},
+        {"matrix": [2, 10], "x": 11, "y": 2.5},
+        {"matrix": [2, 11], "x": 12, "y": 2.5},
+
+        {"matrix": [3, 3], "x": 3, "y": 4},
+        {"matrix": [3, 4], "x": 4, "y": 4},
+        {"matrix": [3, 5], "x": 5, "y": 4},
+
+        {"matrix": [3, 6], "x": 7, "y": 4},
+        {"matrix": [3, 7], "x": 8, "y": 4},
+        {"matrix": [3, 8], "x": 9, "y": 4},
+
+        {"matrix": [4, 2], "x": 2, "y": 5},
+        {"matrix": [4, 3], "x": 3, "y": 5},
+        {"matrix": [4, 4], "x": 4, "y": 5},
+        {"matrix": [4, 5], "x": 5, "y": 5},
+
+        {"matrix": [4, 6], "x": 7, "y": 5},
+        {"matrix": [4, 7], "x": 8, "y": 5},
+        {"matrix": [4, 8], "x": 9, "y": 5},
+        {"matrix": [4, 9], "x": 10, "y": 5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index bfa5252a039..fd5fa4db1a9 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -1,16 +1,5 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-#MOUSEKEY_ENABLE = yes	# Mouse keys
-POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
 POINTING_DEVICE_DRIVER = custom
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
 CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
 SRC += matrix.c
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
deleted file mode 100644
index 4f3b03b6f9e..00000000000
--- a/keyboards/dm9records/ergoinu/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-  "keyboard_name": "Ergoinu",
-  "manufacturer": "Dm9Records",
-  "url": "",
-  "maintainer": "hsgw(Takuya Urakawa)",
-  "usb": {
-    "vid": "0x04D8",
-    "pid": "0xEE60",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
-    "rows": ["F6", "F7", "B1", "B3", "B2"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 7
-  },
-  "ws2812": {
-    "pin": "B6"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.6},
-        {"matrix": [0, 1], "x": 1, "y": 0.4},
-        {"matrix": [0, 2], "x": 2, "y": 0.4},
-        {"matrix": [0, 3], "x": 3, "y": 0.25},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6, "y": 0.4},
-
-        {"matrix": [5, 6], "x": 11, "y": 0.4},
-        {"matrix": [5, 5], "x": 12, "y": 0.25},
-        {"matrix": [5, 4], "x": 13, "y": 0},
-        {"matrix": [5, 3], "x": 14, "y": 0.25},
-        {"matrix": [5, 2], "x": 15, "y": 0.4},
-        {"matrix": [5, 1], "x": 16, "y": 0.4},
-        {"matrix": [5, 0], "x": 17, "y": 0.6},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.6},
-        {"matrix": [1, 1], "x": 1, "y": 1.4},
-        {"matrix": [1, 2], "x": 2, "y": 1.4},
-        {"matrix": [1, 3], "x": 3, "y": 1.25},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6, "y": 1.4},
-
-        {"matrix": [6, 6], "x": 11, "y": 1.4},
-        {"matrix": [6, 5], "x": 12, "y": 1.25},
-        {"matrix": [6, 4], "x": 13, "y": 1},
-        {"matrix": [6, 3], "x": 14, "y": 1.25},
-        {"matrix": [6, 2], "x": 15, "y": 1.4},
-        {"matrix": [6, 1], "x": 16, "y": 1.4},
-        {"matrix": [6, 0], "x": 17, "y": 1.6},
-
-        {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75},
-        {"matrix": [2, 2], "x": 2, "y": 2.4},
-        {"matrix": [2, 3], "x": 3, "y": 2.25},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-        {"matrix": [2, 6], "x": 6, "y": 2.4},
-
-        {"matrix": [7, 6], "x": 11, "y": 2.4},
-        {"matrix": [7, 5], "x": 12, "y": 2.25},
-        {"matrix": [7, 4], "x": 13, "y": 2},
-        {"matrix": [7, 3], "x": 14, "y": 2.25},
-        {"matrix": [7, 2], "x": 15, "y": 2.4},
-        {"matrix": [7, 1], "x": 16, "y": 2.4},
-        {"matrix": [7, 0], "x": 17, "y": 2.6},
-
-        {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75},
-        {"matrix": [3, 2], "x": 2, "y": 3.4},
-        {"matrix": [3, 3], "x": 3, "y": 3.25},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6, "y": 3.4},
-
-        {"matrix": [8, 6], "x": 11, "y": 3.4},
-        {"matrix": [8, 5], "x": 12, "y": 3.25},
-        {"matrix": [8, 4], "x": 13, "y": 3},
-        {"matrix": [8, 3], "x": 14, "y": 3.25},
-        {"matrix": [8, 2], "x": 15, "y": 3.4},
-        {"matrix": [8, 1], "x": 16, "y": 3.4},
-        {"matrix": [8, 0], "x": 17, "y": 3.6},
-
-        {"matrix": [4, 2], "x": 3, "y": 4.25},
-        {"matrix": [4, 3], "x": 4, "y": 4},
-        {"matrix": [4, 4], "x": 5, "y": 4.25},
-        {"matrix": [4, 5], "x": 6, "y": 4.4},
-        {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5},
-
-        {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5},
-        {"matrix": [9, 5], "x": 11, "y": 4.4},
-        {"matrix": [9, 4], "x": 12, "y": 4.25},
-        {"matrix": [9, 3], "x": 13, "y": 4},
-        {"matrix": [9, 2], "x": 14, "y": 4.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/dm9records/ergoinu/keyboard.json b/keyboards/dm9records/ergoinu/keyboard.json
new file mode 100644
index 00000000000..c132f18268b
--- /dev/null
+++ b/keyboards/dm9records/ergoinu/keyboard.json
@@ -0,0 +1,114 @@
+{
+  "keyboard_name": "Ergoinu",
+  "manufacturer": "Dm9Records",
+  "url": "",
+  "maintainer": "hsgw(Takuya Urakawa)",
+  "usb": {
+    "vid": "0x04D8",
+    "pid": "0xEE60",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
+    "rows": ["F6", "F7", "B1", "B3", "B2"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 7
+  },
+  "ws2812": {
+    "pin": "B6"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.6},
+        {"matrix": [0, 1], "x": 1, "y": 0.4},
+        {"matrix": [0, 2], "x": 2, "y": 0.4},
+        {"matrix": [0, 3], "x": 3, "y": 0.25},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.4},
+
+        {"matrix": [5, 6], "x": 11, "y": 0.4},
+        {"matrix": [5, 5], "x": 12, "y": 0.25},
+        {"matrix": [5, 4], "x": 13, "y": 0},
+        {"matrix": [5, 3], "x": 14, "y": 0.25},
+        {"matrix": [5, 2], "x": 15, "y": 0.4},
+        {"matrix": [5, 1], "x": 16, "y": 0.4},
+        {"matrix": [5, 0], "x": 17, "y": 0.6},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.6},
+        {"matrix": [1, 1], "x": 1, "y": 1.4},
+        {"matrix": [1, 2], "x": 2, "y": 1.4},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.4},
+
+        {"matrix": [6, 6], "x": 11, "y": 1.4},
+        {"matrix": [6, 5], "x": 12, "y": 1.25},
+        {"matrix": [6, 4], "x": 13, "y": 1},
+        {"matrix": [6, 3], "x": 14, "y": 1.25},
+        {"matrix": [6, 2], "x": 15, "y": 1.4},
+        {"matrix": [6, 1], "x": 16, "y": 1.4},
+        {"matrix": [6, 0], "x": 17, "y": 1.6},
+
+        {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75},
+        {"matrix": [2, 2], "x": 2, "y": 2.4},
+        {"matrix": [2, 3], "x": 3, "y": 2.25},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6, "y": 2.4},
+
+        {"matrix": [7, 6], "x": 11, "y": 2.4},
+        {"matrix": [7, 5], "x": 12, "y": 2.25},
+        {"matrix": [7, 4], "x": 13, "y": 2},
+        {"matrix": [7, 3], "x": 14, "y": 2.25},
+        {"matrix": [7, 2], "x": 15, "y": 2.4},
+        {"matrix": [7, 1], "x": 16, "y": 2.4},
+        {"matrix": [7, 0], "x": 17, "y": 2.6},
+
+        {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.4},
+        {"matrix": [3, 3], "x": 3, "y": 3.25},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6, "y": 3.4},
+
+        {"matrix": [8, 6], "x": 11, "y": 3.4},
+        {"matrix": [8, 5], "x": 12, "y": 3.25},
+        {"matrix": [8, 4], "x": 13, "y": 3},
+        {"matrix": [8, 3], "x": 14, "y": 3.25},
+        {"matrix": [8, 2], "x": 15, "y": 3.4},
+        {"matrix": [8, 1], "x": 16, "y": 3.4},
+        {"matrix": [8, 0], "x": 17, "y": 3.6},
+
+        {"matrix": [4, 2], "x": 3, "y": 4.25},
+        {"matrix": [4, 3], "x": 4, "y": 4},
+        {"matrix": [4, 4], "x": 5, "y": 4.25},
+        {"matrix": [4, 5], "x": 6, "y": 4.4},
+        {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5},
+
+        {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5},
+        {"matrix": [9, 5], "x": 11, "y": 4.4},
+        {"matrix": [9, 4], "x": 12, "y": 4.25},
+        {"matrix": [9, 3], "x": 13, "y": 4},
+        {"matrix": [9, 2], "x": 14, "y": 4.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/dm9records/ergoinu/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
deleted file mode 100644
index a18de0accdb..00000000000
--- a/keyboards/dm9records/plaid/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "keyboard_name": "Plaid",
-  "manufacturer": "Dm9Records",
-  "url": "https://github.com/hsgw/plaid",
-  "maintainer": "hsgw(Takuya Urakawa)",
-  "usb": {
-    "vid": "0x16C0",
-    "pid": "0x27DB",
-    "device_version": "0.0.2",
-    "max_power": 100
-  },
-  "matrix_pins": {
-    "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
-    "rows": ["B4", "B5", "B3", "D4"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_ortho_4x12",
-    "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
-    "LAYOUT_plaid_mit": "LAYOUT_planck_mit"
-  },
-  "layouts": {
-    "LAYOUT_planck_mit": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/dm9records/plaid/keyboard.json b/keyboards/dm9records/plaid/keyboard.json
new file mode 100644
index 00000000000..a2052e55621
--- /dev/null
+++ b/keyboards/dm9records/plaid/keyboard.json
@@ -0,0 +1,141 @@
+{
+  "keyboard_name": "Plaid",
+  "manufacturer": "Dm9Records",
+  "url": "https://github.com/hsgw/plaid",
+  "maintainer": "hsgw(Takuya Urakawa)",
+  "usb": {
+    "vid": "0x16C0",
+    "pid": "0x27DB",
+    "device_version": "0.0.2",
+    "max_power": 100
+  },
+  "matrix_pins": {
+    "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
+    "rows": ["B4", "B5", "B3", "D4"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true
+  },
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
+    "LAYOUT_plaid_mit": "LAYOUT_planck_mit"
+  },
+  "layouts": {
+    "LAYOUT_planck_mit": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk
index 760f9b9650b..16051206467 100644
--- a/keyboards/dm9records/plaid/rules.mk
+++ b/keyboards/dm9records/plaid/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
deleted file mode 100644
index 0f8168edb9d..00000000000
--- a/keyboards/dm9records/tartan/info.json
+++ /dev/null
@@ -1,447 +0,0 @@
-{
-  "keyboard_name": "Tartan",
-  "manufacturer": "Dm9Records",
-  "url": "https://github.com/hsgw/tartan",
-  "maintainer": "hsgw(Takuya Urakawa)",
-  "usb": {
-    "vid": "0x16C0",
-    "pid": "0x27DB",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
-    "rows": ["B4", "B5", "B3", "B0", "C0"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
-  "layout_aliases": {
-    "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
-  },
-  "layouts": {
-    "LAYOUT_60_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_ansi_split_bs": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [4, 9], "x": 13, "y": 0},
-        {"matrix": [4, 10], "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": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "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": [4, 9], "x": 13, "y": 0},
-        {"matrix": [4, 10], "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": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [4, 12], "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, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "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": [4, 9], "x": 13, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_iso_split_bs": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [4, 9], "x": 13, "y": 0},
-        {"matrix": [4, 10], "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, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    },
-    "LAYOUT_60_iso_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": [4, 9], "x": 13, "y": 0},
-        {"matrix": [4, 10], "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, 0], "x": 0, "y": 2, "w": 1.75},
-        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
-        {"matrix": [4, 12], "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, 3], "x": 3.75, "y": 4, "w": 6.25},
-        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
-        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/dm9records/tartan/keyboard.json b/keyboards/dm9records/tartan/keyboard.json
new file mode 100644
index 00000000000..208dcf330b9
--- /dev/null
+++ b/keyboards/dm9records/tartan/keyboard.json
@@ -0,0 +1,452 @@
+{
+  "keyboard_name": "Tartan",
+  "manufacturer": "Dm9Records",
+  "url": "https://github.com/hsgw/tartan",
+  "maintainer": "hsgw(Takuya Urakawa)",
+  "usb": {
+    "vid": "0x16C0",
+    "pid": "0x27DB",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
+    "rows": ["B4", "B5", "B3", "B0", "C0"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true
+  },
+  "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
+  "layout_aliases": {
+    "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
+  },
+  "layouts": {
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi_split_bs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [4, 9], "x": 13, "y": 0},
+        {"matrix": [4, 10], "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": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "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": [4, 9], "x": 13, "y": 0},
+        {"matrix": [4, 10], "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": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [4, 12], "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, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "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": [4, 9], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_iso_split_bs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [4, 9], "x": 13, "y": 0},
+        {"matrix": [4, 10], "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, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_iso_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": [4, 9], "x": 13, "y": 0},
+        {"matrix": [4, 10], "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, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [4, 11], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [4, 12], "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, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}
diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk
index 722ea170590..16051206467 100644
--- a/keyboards/dm9records/tartan/rules.mk
+++ b/keyboards/dm9records/tartan/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json
index cadfabdf861..08c19819bb0 100644
--- a/keyboards/doio/kb16/info.json
+++ b/keyboards/doio/kb16/info.json
@@ -8,15 +8,6 @@
         "force_nkro": true
     },
     "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "nkro": true,
-        "oled": true,
-        "rgb_matrix": true,
-        "encoder": true
-    },
     "build": {
         "lto": true
     },
diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c
index 12ca8694c1d..c90df38aec0 100644
--- a/keyboards/doio/kb16/lib/bongocat/bongocat.c
+++ b/keyboards/doio/kb16/lib/bongocat/bongocat.c
@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
 
 // WPM-responsive animation stuff here
 #define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
 #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
-#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
 
 uint32_t curr_anim_duration = 0; // variable animation duration
 uint32_t bongo_timer = 0;
diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.c b/keyboards/doio/kb16/lib/layer_status/layer_status.c
index 657ac86ff21..d9ba20bd8c4 100644
--- a/keyboards/doio/kb16/lib/layer_status/layer_status.c
+++ b/keyboards/doio/kb16/lib/layer_status/layer_status.c
@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "oled_driver.h"
+#include "action_layer.h"
+#include "progmem.h"
 
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
 
diff --git a/keyboards/doio/kb16/lib/logo.c b/keyboards/doio/kb16/lib/logo.c
index 7a52b479ff4..ade4b954e09 100644
--- a/keyboards/doio/kb16/lib/logo.c
+++ b/keyboards/doio/kb16/lib/logo.c
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "oled_driver.h"
+#include "progmem.h"
 
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
 
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
deleted file mode 100644
index fc9b30a20a0..00000000000
--- a/keyboards/doio/kb16/rev1/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "grave_esc": false,
-        "space_cadet": false,
-        "magic": false
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F4", "F1", "F0", "B7"],
-        "rows": ["D5", "D4", "D3", "D2"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F7", "pin_b": "E6"},
-            {"pin_a": "C7", "pin_b": "C6"},
-            {"pin_a": "D7", "pin_b": "D6"}
-        ]
-    },
-    "ws2812": {
-        "pin": "F6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/doio/kb16/rev1/keyboard.json b/keyboards/doio/kb16/rev1/keyboard.json
new file mode 100644
index 00000000000..e1382860b8f
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keyboard.json
@@ -0,0 +1,33 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "encoder": true,
+        "grave_esc": false,
+        "space_cadet": false,
+        "magic": false
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B7"],
+        "rows": ["D5", "D4", "D3", "D2"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F7", "pin_b": "E6"},
+            {"pin_a": "C7", "pin_b": "C6"},
+            {"pin_a": "D7", "pin_b": "D6"}
+        ]
+    },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
deleted file mode 100644
index b3f14e180d7..00000000000
--- a/keyboards/doio/kb16/rev2/info.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["B14", "B13", "B12", "B0", "A7"],
-        "rows": ["B3", "B4", "B9", "B8"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B6"},
-            {"pin_a": "A1", "pin_b": "A2"},
-            {"pin_a": "A3", "pin_b": "A4"}
-        ]
-    },
-    "ws2812": {
-        "pin": "A10"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino"
-}
diff --git a/keyboards/doio/kb16/rev2/keyboard.json b/keyboards/doio/kb16/rev2/keyboard.json
new file mode 100644
index 00000000000..a1157072910
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keyboard.json
@@ -0,0 +1,30 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["B14", "B13", "B12", "B0", "A7"],
+        "rows": ["B3", "B4", "B9", "B8"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B6"},
+            {"pin_a": "A1", "pin_b": "A2"},
+            {"pin_a": "A3", "pin_b": "A4"}
+        ]
+    },
+    "ws2812": {
+        "pin": "A10"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "oled": true,
+        "rgb_matrix": true,
+        "encoder": true
+    }
+}
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
deleted file mode 100644
index a89c5951e39..00000000000
--- a/keyboards/doio/kb38/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-    "manufacturer": "Doio",
-    "keyboard_name": "doio/kb38",
-    "maintainer": "PepperKats",
-    "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
-        "rows": ["D5", "D4", "D3", "D2", "B3", "B2"]
-    },
-    "processor": "atmega32u4",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C7", "pin_b": "C6"},
-            {"pin_a": "F7", "pin_b": "E6"},
-            {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
-        ]
-    },
-    "ws2812": {
-        "pin": "F6"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "cycle_all": true,
-            "rainbow_moving_chevron": true
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
-            {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
-            {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
-            {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
-            {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
-            {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
-            {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
-            {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
-
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
-            {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
-            {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
-            {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
-            {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
-            {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
-            {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
-
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
-            {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
-            {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
-            {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
-            {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
-            {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
-            {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
-
-            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
-            {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
-            {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
-            {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
-            {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
-            {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
-
-            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
-            {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
-            {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
-            {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
-            {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
-
-            {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
-            {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
-            {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
-            {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
-            {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
-
-            {"flags": 2, "x": 224, "y": 64},
-            {"flags": 2, "x": 74.6, "y": 64},
-            {"flags": 2, "x": 0, "y": 64},
-            {"flags": 2, "x": 0, "y": 0},
-            {"flags": 2, "x": 74.6, "y": 0},
-            {"flags": 2, "x": 224, "y": 0}
-        ],
-        "max_brightness": 200,
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
-                {"matrix": [0, 1], "label": "BSPC", "x": 2, "y": 0, "w": 2},
-                {"matrix": [0, 2], "label": "RGB BACK", "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "label": "RGB OFF", "x": 5.25, "y": 0},
-                {"matrix": [0, 4], "label": "RGB FORW", "x": 6.25, "y": 0},
-                {"matrix": [0, 5], "label": "MAKE", "x": 7.5, "y": 0},
-                {"matrix": [0, 6], "label": "REBOOT", "x": 8.5, "y": 0},
-                {"matrix": [0, 7], "label": "BOOTLOAD", "x": 9.5, "y": 0},
-
-                {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "label": "PAUS", "x": 4.25, "y": 1.25},
-                {"matrix": [1, 5], "label": "SCRL", "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "label": "PSCR", "x": 6.25, "y": 1.25},
-
-                {"matrix": [2, 0], "label": "7", "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "label": "8", "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "label": "9", "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
-                {"matrix": [2, 4], "label": "INS", "x": 4.25, "y": 2.25},
-                {"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
-                {"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
-
-                {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
-
-                {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
-
-                {"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
-                {"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
-                {"matrix": [3, 3], "label": "END", "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "label": "DEL", "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "label": "PGDN", "x": 6.25, "y": 3.25},
-
-                {"matrix": [4, 0], "label": "1", "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "label": "2", "x": 1, "y": 4.25},
-                {"matrix": [4, 2], "label": "3", "x": 2, "y": 4.25},
-                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
-                {"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
-
-                {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
-
-                {"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
-                {"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
-                {"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
-                {"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
-                {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/doio/kb38/keyboard.json b/keyboards/doio/kb38/keyboard.json
new file mode 100644
index 00000000000..7e978b2be8b
--- /dev/null
+++ b/keyboards/doio/kb38/keyboard.json
@@ -0,0 +1,158 @@
+{
+    "manufacturer": "Doio",
+    "keyboard_name": "doio/kb38",
+    "maintainer": "PepperKats",
+    "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "oled": true,
+        "encoder": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
+        "rows": ["D5", "D4", "D3", "D2", "B3", "B2"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3801",
+        "vid": "0xD010"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C7", "pin_b": "C6"},
+            {"pin_a": "F7", "pin_b": "E6"},
+            {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
+        ]
+    },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_all": true,
+            "rainbow_moving_chevron": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
+
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
+            {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
+            {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
+            {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
+            {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
+
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
+            {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
+            {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
+            {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
+            {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
+            {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
+
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
+            {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
+            {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
+            {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
+            {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
+            {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
+
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
+            {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
+            {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
+            {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
+            {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
+
+            {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
+            {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
+            {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
+
+            {"flags": 2, "x": 224, "y": 64},
+            {"flags": 2, "x": 74.6, "y": 64},
+            {"flags": 2, "x": 0, "y": 64},
+            {"flags": 2, "x": 0, "y": 0},
+            {"flags": 2, "x": 74.6, "y": 0},
+            {"flags": 2, "x": 224, "y": 0}
+        ],
+        "max_brightness": 200,
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "BSPC", "x": 2, "y": 0, "w": 2},
+                {"matrix": [0, 2], "label": "RGB BACK", "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "label": "RGB OFF", "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "label": "RGB FORW", "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "label": "MAKE", "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "label": "REBOOT", "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "label": "BOOTLOAD", "x": 9.5, "y": 0},
+
+                {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "PAUS", "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "label": "SCRL", "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "label": "PSCR", "x": 6.25, "y": 1.25},
+
+                {"matrix": [2, 0], "label": "7", "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "label": "8", "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "label": "9", "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [2, 4], "label": "INS", "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
+                {"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
+
+                {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
+
+                {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
+
+                {"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "label": "END", "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "label": "DEL", "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "label": "PGDN", "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 0], "label": "1", "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "label": "2", "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "label": "3", "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
+                {"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
+
+                {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
+
+                {"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
+                {"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
+                {"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
+                {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/doio/kb38/rules.mk b/keyboards/doio/kb38/rules.mk
index a5f1063634e..942ef4c5dbd 100644
--- a/keyboards/doio/kb38/rules.mk
+++ b/keyboards/doio/kb38/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_CUSTOM_KB = yes
\ No newline at end of file
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
deleted file mode 100644
index ea53bfb9156..00000000000
--- a/keyboards/doppelganger/info.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "keyboard_name": "Doppelganger",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4447",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
-        "rows": ["E6", "F1", "C7", "F7", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D1",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
-                "rows": ["D7", "D6", "D4", "E6", "B5"]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 2,
-        "split_count": [1, 1]
-    },
-    "ws2812": {
-        "pin": "B4"
-    },
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 10.5, "y": 0},
-                {"matrix": [5, 1], "x": 11.5, "y": 0},
-                {"matrix": [5, 2], "x": 12.5, "y": 0},
-                {"matrix": [5, 3], "x": 13.5, "y": 0},
-                {"matrix": [5, 4], "x": 14.5, "y": 0},
-                {"matrix": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-
-                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-                {"matrix": [1, 7], "x": 8, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [6, 8], "x": 19, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-
-                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-                {"matrix": [2, 7], "x": 8.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.25, "y": 2},
-                {"matrix": [7, 1], "x": 11.25, "y": 2},
-                {"matrix": [7, 2], "x": 12.25, "y": 2},
-                {"matrix": [7, 3], "x": 13.25, "y": 2},
-                {"matrix": [7, 4], "x": 14.25, "y": 2},
-                {"matrix": [7, 5], "x": 15.25, "y": 2},
-                {"matrix": [7, 6], "x": 16.25, "y": 2},
-                {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25},
-
-                {"matrix": [7, 8], "x": 19, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-
-                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-
-                {"matrix": [8, 1], "x": 10.75, "y": 3},
-                {"matrix": [8, 2], "x": 11.75, "y": 3},
-                {"matrix": [8, 3], "x": 12.75, "y": 3},
-                {"matrix": [8, 4], "x": 13.75, "y": 3},
-                {"matrix": [8, 5], "x": 14.75, "y": 3},
-                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 7], "x": 17.75, "y": 3.25},
-
-                {"matrix": [8, 8], "x": 19, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8.25, "y": 4},
-
-                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 14.25, "y": 4},
-                {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 6], "x": 16.75, "y": 4.25},
-                {"matrix": [9, 7], "x": 17.75, "y": 4.25},
-                {"matrix": [9, 8], "x": 18.75, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/doppelganger/keyboard.json b/keyboards/doppelganger/keyboard.json
new file mode 100644
index 00000000000..2be90e30abf
--- /dev/null
+++ b/keyboards/doppelganger/keyboard.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Doppelganger",
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4447",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
+        "rows": ["E6", "F1", "C7", "F7", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D1",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+                "rows": ["D7", "D6", "D4", "E6", "B5"]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 2,
+        "split_count": [1, 1]
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2},
+                {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25},
+
+                {"matrix": [7, 8], "x": 19, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 1], "x": 10.75, "y": 3},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 4], "x": 13.75, "y": 3},
+                {"matrix": [8, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 3.25},
+
+                {"matrix": [8, 8], "x": 19, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4},
+                {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 7], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.75, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk
deleted file mode 100644
index f1a07bd25ef..00000000000
--- a/keyboards/doppelganger/rules.mk
+++ /dev/null
@@ -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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json
index 442d6d6a66d..7fa05f4c121 100644
--- a/keyboards/dp3000/info.json
+++ b/keyboards/dp3000/info.json
@@ -3,16 +3,6 @@
     "maintainer": "depermana12",
     "diode_direction": "COL2ROW",
     "development_board": "promicro",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "encoder": true,
-        "oled": true,
-        "mousekey": false,
-        "nkro": false
-    },
     "build": {
         "lto": true
     },
diff --git a/keyboards/dp3000/rev1/keyboard.json b/keyboards/dp3000/rev1/keyboard.json
index 63d023de5cf..aa7ff8bc0a9 100644
--- a/keyboards/dp3000/rev1/keyboard.json
+++ b/keyboards/dp3000/rev1/keyboard.json
@@ -1,6 +1,14 @@
 {
     "keyboard_name": "dp3000",
     "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "encoder": true,
+        "oled": true,
+        "mousekey": false,
+        "nkro": false,
         "rgb_matrix": true
     },
     "usb": {
diff --git a/keyboards/dp3000/rev2/keyboard.json b/keyboards/dp3000/rev2/keyboard.json
index f6f03eeb639..7d82c384601 100644
--- a/keyboards/dp3000/rev2/keyboard.json
+++ b/keyboards/dp3000/rev2/keyboard.json
@@ -1,6 +1,14 @@
 {
     "keyboard_name": "dp3000 rev2",
     "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "encoder": true,
+        "oled": true,
+        "mousekey": false,
+        "nkro": false,
         "rgblight": true
     },
     "usb": {
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
deleted file mode 100644
index df141030e1b..00000000000
--- a/keyboards/dp60/info.json
+++ /dev/null
@@ -1,1196 +0,0 @@
-{
-    "keyboard_name": "DP60",
-    "manufacturer": "astro",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x60BE",
-        "pid": "0x00BE",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true
-        },
-        "driver": "is31fl3731"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift",
-        "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_ansi_wkl",
-        "60_ansi_wkl_split_bs_rshift",
-        "60_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan",
-        "60_iso_tsangan_split_bs_rshift",
-        "60_iso_wkl",
-        "60_iso_wkl_split_bs_rshift"
-    ],
-    "layouts": {
-        "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 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, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4}
-            ]
-        },
-        "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan_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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2},
-                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_true_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": [4, 7], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 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, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dp60/keyboard.json b/keyboards/dp60/keyboard.json
new file mode 100644
index 00000000000..8f9567c8441
--- /dev/null
+++ b/keyboards/dp60/keyboard.json
@@ -0,0 +1,1203 @@
+{
+    "keyboard_name": "DP60",
+    "manufacturer": "astro",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x60BE",
+        "pid": "0x00BE",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3731"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "layout_aliases": {
+        "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift",
+        "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_ansi_wkl",
+        "60_ansi_wkl_split_bs_rshift",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan",
+        "60_iso_tsangan_split_bs_rshift",
+        "60_iso_wkl",
+        "60_iso_wkl_split_bs_rshift"
+    ],
+    "layouts": {
+        "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [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, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 0], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_true_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": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c
index e32c9a58f94..22156745f17 100644
--- a/keyboards/dp60/matrix.c
+++ b/keyboards/dp60/matrix.c
@@ -13,7 +13,10 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "quantum.h"
+#include "matrix.h"
+#include "print.h"
+#include "bitwise.h"
+#include "wait.h"
 
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk
index 0aa07f4709d..8784813b335 100644
--- a/keyboards/dp60/rules.mk
+++ b/keyboards/dp60/rules.mk
@@ -1,16 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Use RGB underglow light
-RGB_MATRIX_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
deleted file mode 100644
index cd157a0ed58..00000000000
--- a/keyboards/draculad/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "keyboard_name": "DracuLad",
-    "manufacturer": "MangoIV",
-    "url": "",
-    "maintainer": "MangoIV",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1B1E",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 10,
-        "sleep": true,
-        "split": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "static_gradient": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B6"},
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B2", "pin_b": "B6", "resolution": 4},
-                    {"pin_a": "B4", "pin_b": "B5", "resolution": 1}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.35},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.35},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-
-                {"matrix": [4, 4], "x": 8, "y": 0.5},
-                {"matrix": [4, 3], "x": 9, "y": 0.35},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0.35},
-                {"matrix": [4, 0], "x": 12, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.35},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.35},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-
-                {"matrix": [5, 4], "x": 8, "y": 1.5},
-                {"matrix": [5, 3], "x": 9, "y": 1.35},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1.35},
-                {"matrix": [5, 0], "x": 12, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.35},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.35},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-
-                {"matrix": [6, 4], "x": 8, "y": 2.5},
-                {"matrix": [6, 3], "x": 9, "y": 2.35},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2.35},
-                {"matrix": [6, 0], "x": 12, "y": 3},
-
-                {"matrix": [3, 1], "x": 4.25, "y": 3.5},
-
-                {"matrix": [7, 1], "x": 7.75, "y": 3.5},
-
-                {"matrix": [3, 2], "x": 3, "y": 4.5},
-                {"matrix": [3, 3], "x": 4, "y": 4.5},
-                {"matrix": [3, 4], "x": 5, "y": 4.5},
-
-                {"matrix": [7, 4], "x": 7, "y": 4.5},
-                {"matrix": [7, 3], "x": 8, "y": 4.5},
-                {"matrix": [7, 2], "x": 9, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/draculad/keyboard.json b/keyboards/draculad/keyboard.json
new file mode 100644
index 00000000000..bfaa8a4979d
--- /dev/null
+++ b/keyboards/draculad/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "DracuLad",
+    "manufacturer": "MangoIV",
+    "url": "",
+    "maintainer": "MangoIV",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1B1E",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 10,
+        "sleep": true,
+        "split": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "static_gradient": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B6"},
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B2", "pin_b": "B6", "resolution": 4},
+                    {"pin_a": "B4", "pin_b": "B5", "resolution": 1}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "oled": true,
+        "wpm": true,
+        "encoder": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.35},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.35},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+                {"matrix": [4, 4], "x": 8, "y": 0.5},
+                {"matrix": [4, 3], "x": 9, "y": 0.35},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0.35},
+                {"matrix": [4, 0], "x": 12, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.35},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.35},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [5, 4], "x": 8, "y": 1.5},
+                {"matrix": [5, 3], "x": 9, "y": 1.35},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1.35},
+                {"matrix": [5, 0], "x": 12, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.35},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.35},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+                {"matrix": [6, 4], "x": 8, "y": 2.5},
+                {"matrix": [6, 3], "x": 9, "y": 2.35},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2.35},
+                {"matrix": [6, 0], "x": 12, "y": 3},
+
+                {"matrix": [3, 1], "x": 4.25, "y": 3.5},
+
+                {"matrix": [7, 1], "x": 7.75, "y": 3.5},
+
+                {"matrix": [3, 2], "x": 3, "y": 4.5},
+                {"matrix": [3, 3], "x": 4, "y": 4.5},
+                {"matrix": [3, 4], "x": 5, "y": 4.5},
+
+                {"matrix": [7, 4], "x": 7, "y": 4.5},
+                {"matrix": [7, 3], "x": 8, "y": 4.5},
+                {"matrix": [7, 2], "x": 9, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk
deleted file mode 100644
index 5f5fd002a1a..00000000000
--- a/keyboards/draculad/rules.mk
+++ /dev/null
@@ -1,17 +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
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
deleted file mode 100644
index 4ae200c6a66..00000000000
--- a/keyboards/draytronics/scarlet/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json
deleted file mode 100644
index cb84baca06c..00000000000
--- a/keyboards/draytronics/scarlet/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "keyboard_name": "SCARLET",
-    "manufacturer": "Draytronics",
-    "url": "https://www.draytronics.co.uk/scarlet",
-    "maintainer": "ghostseven",
-    "usb": {
-        "vid": "0x4454",
-        "pid": "0x5343",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A5", "A6", "A7", "C7"],
-        "rows": ["A0", "A1", "A2", "A3", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "community_layouts": ["numpad_5x4"],
-    "layouts": {
-        "LAYOUT_numpad_5x4": {
-            "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": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/draytronics/scarlet/keyboard.json b/keyboards/draytronics/scarlet/keyboard.json
new file mode 100644
index 00000000000..0eabd378da2
--- /dev/null
+++ b/keyboards/draytronics/scarlet/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "keyboard_name": "SCARLET",
+    "manufacturer": "Draytronics",
+    "url": "https://www.draytronics.co.uk/scarlet",
+    "maintainer": "ghostseven",
+    "usb": {
+        "vid": "0x4454",
+        "pid": "0x5343",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C7"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["numpad_5x4"],
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "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": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/draytronics/scarlet/rules.mk
+++ b/keyboards/draytronics/scarlet/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/alt/v2/info.json
rename to keyboards/drop/alt/v2/keyboard.json
diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json
similarity index 100%
rename from keyboards/drop/cstm65/info.json
rename to keyboards/drop/cstm65/keyboard.json
diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json
similarity index 100%
rename from keyboards/drop/cstm80/info.json
rename to keyboards/drop/cstm80/keyboard.json
diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/ctrl/v2/info.json
rename to keyboards/drop/ctrl/v2/keyboard.json
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json
similarity index 100%
rename from keyboards/drop/sense75/info.json
rename to keyboards/drop/sense75/keyboard.json
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/shift/v2/info.json
rename to keyboards/drop/shift/v2/keyboard.json
diff --git a/keyboards/duck/duck_led/duck_led.c b/keyboards/duck/duck_led/duck_led.c
index 2fa920e4b61..ce9bd0fde10 100644
--- a/keyboards/duck/duck_led/duck_led.c
+++ b/keyboards/duck/duck_led/duck_led.c
@@ -1,6 +1,5 @@
-#include <avr/io.h>
 #include "duck_led.h"
-#include "quantum.h"
+#include "wait.h"
 
 void show(void) {
   wait_us((RES / 1000UL) + 1);
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
deleted file mode 100644
index 3f8b63596c4..00000000000
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ /dev/null
@@ -1,1100 +0,0 @@
-{
-    "keyboard_name": "Eagle/Viper V2",
-    "manufacturer": "Duck",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x4556",
-        "device_version": "0.0.2"
-    },
-    "backlight": {
-        "driver": "custom"
-    },
-    "bootmagic": {
-        "matrix": [4, 10]
-    },
-    "rgblight": {
-        "led_count": 17,
-        "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": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_eagle": "LAYOUT_60_ansi",
-        "LAYOUT_viper": "LAYOUT_60_hhkb",
-        "LAYOUT_eagle_splits": "LAYOUT_60_ansi_split_bs_lshift_rshift"
-    },
-    "community_layouts": [
-        "60_ansi",
-        "60_ansi_split_bs_rshift",
-        "60_ansi_tsangan",
-        "60_tsangan_hhkb",
-        "60_ansi_wkl",
-        "60_ansi_wkl_split_bs_rshift",
-        "60_hhkb",
-        "60_iso",
-        "60_iso_split_bs_rshift",
-        "60_iso_tsangan",
-        "60_iso_tsangan_split_bs_rshift",
-        "60_iso_wkl",
-        "60_iso_wkl_split_bs_rshift"
-    ],
-    "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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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": {
-            "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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "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.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "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_tsangan_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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "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_ansi_split_bs_lshift_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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "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, 14], "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, 12], "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.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "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, 14], "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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
-                {"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, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 12.5, "y": 4}
-            ]
-        },
-        "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, 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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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_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, 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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "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_tsangan": {
-            "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, 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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "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.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "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_iso_tsangan_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, 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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "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_iso_wkl": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "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.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_iso_wkl_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/eagle_viper/v2/keyboard.json b/keyboards/duck/eagle_viper/v2/keyboard.json
new file mode 100644
index 00000000000..cae5c54c0e5
--- /dev/null
+++ b/keyboards/duck/eagle_viper/v2/keyboard.json
@@ -0,0 +1,1109 @@
+{
+    "keyboard_name": "Eagle/Viper V2",
+    "manufacturer": "Duck",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4556",
+        "device_version": "0.0.2"
+    },
+    "backlight": {
+        "driver": "custom"
+    },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_eagle": "LAYOUT_60_ansi",
+        "LAYOUT_viper": "LAYOUT_60_hhkb",
+        "LAYOUT_eagle_splits": "LAYOUT_60_ansi_split_bs_lshift_rshift"
+    },
+    "community_layouts": [
+        "60_ansi",
+        "60_ansi_split_bs_rshift",
+        "60_ansi_tsangan",
+        "60_tsangan_hhkb",
+        "60_ansi_wkl",
+        "60_ansi_wkl_split_bs_rshift",
+        "60_hhkb",
+        "60_iso",
+        "60_iso_split_bs_rshift",
+        "60_iso_tsangan",
+        "60_iso_tsangan_split_bs_rshift",
+        "60_iso_wkl",
+        "60_iso_wkl_split_bs_rshift"
+    ],
+    "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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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": {
+            "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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "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_tsangan_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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "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_ansi_split_bs_lshift_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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 14], "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, 12], "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.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "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, 14], "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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"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, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 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, 14], "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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 12.5, "y": 4}
+            ]
+        },
+        "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, 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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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_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, 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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [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, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "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_tsangan": {
+            "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, 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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "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_iso_tsangan_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, 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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "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_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "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.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk
index a2b82ea590e..819cb814ecc 100644
--- a/keyboards/duck/eagle_viper/v2/rules.mk
+++ b/keyboards/duck/eagle_viper/v2/rules.mk
@@ -1,15 +1,2 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/jetfire/indicator_leds.c b/keyboards/duck/jetfire/indicator_leds.c
index 7dbdb1ff79b..200a9ce6ff6 100644
--- a/keyboards/duck/jetfire/indicator_leds.c
+++ b/keyboards/duck/jetfire/indicator_leds.c
@@ -12,13 +12,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "indicator_leds.h"
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <stdbool.h>
 #include <util/delay.h>
-#include <stdint.h>
-#include "indicator_leds.h"
-#include "quantum.h"
 
 #define LED_T1H  900
 #define LED_T1L  600
diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h
index 36dda632fbc..27dcc1535b0 100644
--- a/keyboards/duck/jetfire/indicator_leds.h
+++ b/keyboards/duck/jetfire/indicator_leds.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "duck_led/duck_led.h"
 
 void backlight_init_ports(void);
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
deleted file mode 100644
index fbd5d8cb140..00000000000
--- a/keyboards/duck/jetfire/info.json
+++ /dev/null
@@ -1,292 +0,0 @@
-{
-    "keyboard_name": "Jetfire",
-    "manufacturer": "Duck",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x4A46",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "driver": "custom",
-        "levels": 1
-    },
-    "bootmagic": {
-        "matrix": [5, 10]
-    },
-    "rgblight": {
-        "led_count": 23,
-        "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": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 16], "x": 16.5, "y": 0},
-                {"matrix": [0, 17], "x": 17.5, "y": 0},
-                {"matrix": [0, 18], "x": 18.5, "y": 0},
-                {"matrix": [0, 19], "x": 19.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25},
-                {"matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 19], "x": 19.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-                {"matrix": [3, 19], "x": 19.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 15.25, "y": 4.5},
-
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
-                {"matrix": [4, 19], "x": 19.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
-
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.5, "y": 5.25},
-                {"matrix": [5, 19], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-
-                {"matrix": [0, 16], "x": 16.5, "y": 0},
-                {"matrix": [0, 17], "x": 17.5, "y": 0},
-                {"matrix": [0, 18], "x": 18.5, "y": 0},
-                {"matrix": [0, 19], "x": 19.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-
-                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-
-                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-                {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 15.25, "y": 4.5},
-
-                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
-                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
-
-                {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
-                {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
-
-                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
-                {"matrix": [5, 18], "x": 18.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/jetfire/keyboard.json b/keyboards/duck/jetfire/keyboard.json
new file mode 100644
index 00000000000..a97ff193a88
--- /dev/null
+++ b/keyboards/duck/jetfire/keyboard.json
@@ -0,0 +1,301 @@
+{
+    "keyboard_name": "Jetfire",
+    "manufacturer": "Duck",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4A46",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "driver": "custom",
+        "levels": 1
+    },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
+    "rgblight": {
+        "led_count": 23,
+        "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": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true,
+        "command": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+                {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 19.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.25},
+                {"matrix": [5, 19], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+                {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk
index 26898366237..8d6e39eef11 100644
--- a/keyboards/duck/jetfire/rules.mk
+++ b/keyboards/duck/jetfire/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c \
 			 matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
deleted file mode 100644
index 06d0d59ed19..00000000000
--- a/keyboards/duck/lightsaver/info.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "keyboard_name": "Lightsaver V3",
-  "manufacturer": "Duck",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x444B",
-    "pid": "0x4C53",
-    "device_version": "0.0.3"
-  },
-  "backlight": {
-    "driver": "custom",
-    "levels": 1
-  },
-  "bootmagic": {
-    "matrix": [5, 10]
-  },
-  "rgblight": {
-    "led_count": 17,
-    "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": "D6"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [0, 14], "x": 14, "y": 0},
-        {"matrix": [0, 15], "x": 15, "y": 0},
-        {"matrix": [0, 16], "x": 16, "y": 0},
-        {"matrix": [0, 17], "x": 17, "y": 0},
-        {"matrix": [0, 18], "x": 18, "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, 14], "x": 13, "y": 1, "w": 2},
-        {"matrix": [1, 15], "x": 15, "y": 1},
-        {"matrix": [1, 16], "x": 16, "y": 1},
-        {"matrix": [1, 17], "x": 17, "y": 1},
-        {"matrix": [1, 18], "x": 18, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 15], "x": 15, "y": 2},
-        {"matrix": [2, 16], "x": 16, "y": 2},
-        {"matrix": [2, 17], "x": 17, "y": 2},
-        {"matrix": [2, 18], "x": 18, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
-        {"matrix": [3, 15], "x": 15, "y": 3},
-        {"matrix": [3, 16], "x": 16, "y": 3},
-        {"matrix": [3, 17], "x": 17, "y": 3},
-        {"matrix": [3, 18], "x": 18, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 12], "x": 11.25, "y": 4},
-        {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 14], "x": 14, "y": 4},
-        {"matrix": [4, 15], "x": 15, "y": 4},
-        {"matrix": [4, 16], "x": 16, "y": 4},
-        {"matrix": [4, 17], "x": 17, "y": 4},
-        {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
-
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 13], "x": 13, "y": 5},
-        {"matrix": [5, 14], "x": 14, "y": 5},
-        {"matrix": [5, 15], "x": 15, "y": 5},
-        {"matrix": [5, 16], "x": 16, "y": 5},
-        {"matrix": [5, 17], "x": 17, "y": 5}
-      ]
-    }
-  }
-}
diff --git a/keyboards/duck/lightsaver/keyboard.json b/keyboards/duck/lightsaver/keyboard.json
new file mode 100644
index 00000000000..d4e1cd1e351
--- /dev/null
+++ b/keyboards/duck/lightsaver/keyboard.json
@@ -0,0 +1,158 @@
+{
+  "keyboard_name": "Lightsaver V3",
+  "manufacturer": "Duck",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x444B",
+    "pid": "0x4C53",
+    "device_version": "0.0.3"
+  },
+  "backlight": {
+    "driver": "custom",
+    "levels": 1
+  },
+  "bootmagic": {
+    "matrix": [5, 10]
+  },
+  "rgblight": {
+    "led_count": 17,
+    "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": "D6"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": false,
+    "extrakey": false,
+    "command": true,
+    "nkro": true,
+    "backlight": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [0, 14], "x": 14, "y": 0},
+        {"matrix": [0, 15], "x": 15, "y": 0},
+        {"matrix": [0, 16], "x": 16, "y": 0},
+        {"matrix": [0, 17], "x": 17, "y": 0},
+        {"matrix": [0, 18], "x": 18, "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, 14], "x": 13, "y": 1, "w": 2},
+        {"matrix": [1, 15], "x": 15, "y": 1},
+        {"matrix": [1, 16], "x": 16, "y": 1},
+        {"matrix": [1, 17], "x": 17, "y": 1},
+        {"matrix": [1, 18], "x": 18, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+        {"matrix": [2, 11], "x": 11.5, "y": 2},
+        {"matrix": [2, 12], "x": 12.5, "y": 2},
+        {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+        {"matrix": [2, 15], "x": 15, "y": 2},
+        {"matrix": [2, 16], "x": 16, "y": 2},
+        {"matrix": [2, 17], "x": 17, "y": 2},
+        {"matrix": [2, 18], "x": 18, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+        {"matrix": [3, 6], "x": 6.75, "y": 3},
+        {"matrix": [3, 7], "x": 7.75, "y": 3},
+        {"matrix": [3, 8], "x": 8.75, "y": 3},
+        {"matrix": [3, 9], "x": 9.75, "y": 3},
+        {"matrix": [3, 10], "x": 10.75, "y": 3},
+        {"matrix": [3, 11], "x": 11.75, "y": 3},
+        {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+        {"matrix": [3, 15], "x": 15, "y": 3},
+        {"matrix": [3, 16], "x": 16, "y": 3},
+        {"matrix": [3, 17], "x": 17, "y": 3},
+        {"matrix": [3, 18], "x": 18, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 4.25, "y": 4},
+        {"matrix": [4, 5], "x": 5.25, "y": 4},
+        {"matrix": [4, 6], "x": 6.25, "y": 4},
+        {"matrix": [4, 7], "x": 7.25, "y": 4},
+        {"matrix": [4, 8], "x": 8.25, "y": 4},
+        {"matrix": [4, 9], "x": 9.25, "y": 4},
+        {"matrix": [4, 10], "x": 10.25, "y": 4},
+        {"matrix": [4, 12], "x": 11.25, "y": 4},
+        {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+        {"matrix": [4, 14], "x": 14, "y": 4},
+        {"matrix": [4, 15], "x": 15, "y": 4},
+        {"matrix": [4, 16], "x": 16, "y": 4},
+        {"matrix": [4, 17], "x": 17, "y": 4},
+        {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+        {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+        {"matrix": [5, 13], "x": 13, "y": 5},
+        {"matrix": [5, 14], "x": 14, "y": 5},
+        {"matrix": [5, 15], "x": 15, "y": 5},
+        {"matrix": [5, 16], "x": 16, "y": 5},
+        {"matrix": [5, 17], "x": 17, "y": 5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk
index 2014cb46117..8d6e39eef11 100644
--- a/keyboards/duck/lightsaver/rules.mk
+++ b/keyboards/duck/lightsaver/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c \
 			 matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
deleted file mode 100644
index fbbae2723a8..00000000000
--- a/keyboards/duck/octagon/v1/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "keyboard_name": "Octagon V1",
-    "manufacturer": "Duck",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x4F31",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "driver": "custom",
-        "levels": 1
-    },
-    "bootmagic": {
-        "matrix": [5, 10]
-    },
-    "rgblight": {
-        "led_count": 17,
-        "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": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["75_ansi"],
-    "layouts": {
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4},
-                {"matrix": [4, 2], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [4, 4], "x": 5.25, "y": 4},
-                {"matrix": [4, 5], "x": 6.25, "y": 4},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4},
-                {"matrix": [4, 8], "x": 9.25, "y": 4},
-                {"matrix": [4, 9], "x": 10.25, "y": 4},
-                {"matrix": [4, 10], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 8], "x": 10, "y": 5},
-                {"matrix": [5, 9], "x": 11, "y": 5},
-                {"matrix": [5, 10], "x": 12, "y": 5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/octagon/v1/keyboard.json b/keyboards/duck/octagon/v1/keyboard.json
new file mode 100644
index 00000000000..47f3acdc4d8
--- /dev/null
+++ b/keyboards/duck/octagon/v1/keyboard.json
@@ -0,0 +1,143 @@
+{
+    "keyboard_name": "Octagon V1",
+    "manufacturer": "Duck",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F31",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "driver": "custom",
+        "levels": 1
+    },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "community_layouts": ["75_ansi"],
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk
index 5d79f0af09d..8784813b335 100644
--- a/keyboards/duck/octagon/v1/rules.mk
+++ b/keyboards/duck/octagon/v1/rules.mk
@@ -1,15 +1,2 @@
-# 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 = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
deleted file mode 100644
index be552c7b57a..00000000000
--- a/keyboards/duck/octagon/v2/info.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
-    "keyboard_name": "Octagon V2",
-    "manufacturer": "Duck",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x4F32",
-        "device_version": "0.0.2"
-    },
-    "backlight": {
-        "driver": "custom",
-        "levels": 1
-    },
-    "bootmagic": {
-        "matrix": [5, 10]
-    },
-    "rgblight": {
-        "led_count": 17,
-        "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": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "community_layouts": ["75_ansi", "75_iso"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 16], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 12], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi": {
-          "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 16], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 12], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso": {
-          "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 16], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 15], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 15], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 15], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 12], "x": 11.25, "y": 4},
-                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 14], "x": 14, "y": 4},
-                {"matrix": [4, 15], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 12], "x": 12, "y": 5},
-                {"matrix": [5, 13], "x": 13, "y": 5},
-                {"matrix": [5, 14], "x": 14, "y": 5},
-                {"matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/octagon/v2/keyboard.json b/keyboards/duck/octagon/v2/keyboard.json
new file mode 100644
index 00000000000..4afbc42d47c
--- /dev/null
+++ b/keyboards/duck/octagon/v2/keyboard.json
@@ -0,0 +1,335 @@
+{
+    "keyboard_name": "Octagon V2",
+    "manufacturer": "Duck",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F32",
+        "device_version": "0.0.2"
+    },
+    "backlight": {
+        "driver": "custom",
+        "levels": 1
+    },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": ["75_ansi", "75_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 16], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 12], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi": {
+          "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 16], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 12], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+          "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 16], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 12], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk
index 5e50c2ff8e9..8d6e39eef11 100644
--- a/keyboards/duck/octagon/v2/rules.mk
+++ b/keyboards/duck/octagon/v2/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c \
 			 matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
deleted file mode 100644
index 97885c09102..00000000000
--- a/keyboards/duck/orion/v3/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "keyboard_name": "Orion V3",
-    "manufacturer": "Duck",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x4F52",
-        "device_version": "0.0.2"
-    },
-    "backlight": {
-        "driver": "custom",
-        "pins": ["B1", "B2", "B3", "E6"],
-        "levels": 10
-    },
-    "bootmagic": {
-        "matrix": [4, 10]
-    },
-    "rgblight": {
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["tkl_ansi"],
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 17], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/orion/v3/keyboard.json b/keyboards/duck/orion/v3/keyboard.json
new file mode 100644
index 00000000000..280cd8b07f8
--- /dev/null
+++ b/keyboards/duck/orion/v3/keyboard.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "Orion V3",
+    "manufacturer": "Duck",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x4F52",
+        "device_version": "0.0.2"
+    },
+    "backlight": {
+        "driver": "custom",
+        "pins": ["B1", "B2", "B3", "E6"],
+        "levels": 10
+    },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
+    "rgblight": {
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "backlight": true,
+        "rgblight": true
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 17], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c
index c82d5dd9994..f392b9b1909 100644
--- a/keyboards/duck/orion/v3/matrix.c
+++ b/keyboards/duck/orion/v3/matrix.c
@@ -14,7 +14,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "debug.h"
+#include "bitwise.h"
+#include "wait.h"
 
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk
index 49bc32f39b8..8d6e39eef11 100644
--- a/keyboards/duck/orion/v3/rules.mk
+++ b/keyboards/duck/orion/v3/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c \
 			 matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
deleted file mode 100644
index cee675229d9..00000000000
--- a/keyboards/duck/tcv3/info.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-    "keyboard_name": "TC-V3",
-    "manufacturer": "Duck",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444B",
-        "pid": "0x5443",
-        "device_version": "0.0.1"
-    },
-    "bootmagic": {
-        "matrix": [5, 10]
-    },
-    "rgblight": {
-        "led_count": 17,
-        "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": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 9], "x": 8.75, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-
-                {"matrix": [0, 19], "x": 17.5, "y": 0},
-                {"matrix": [0, 18], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 3], "x": 4, "y": 3.25},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.25},
-                {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
-
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
-                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25},
-                {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
-                {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 14], "x": 13.75, "y": 5.25},
-                {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 9], "x": 8.75, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 13.25, "y": 0},
-                {"matrix": [0, 14], "x": 14.25, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-
-                {"matrix": [0, 19], "x": 17.5, "y": 0},
-                {"matrix": [0, 18], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
-                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
-                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 3], "x": 4, "y": 3.25},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [3, 7], "x": 8, "y": 3.25},
-                {"matrix": [3, 8], "x": 9, "y": 3.25},
-                {"matrix": [3, 9], "x": 10, "y": 3.25},
-                {"matrix": [3, 10], "x": 11, "y": 3.25},
-                {"matrix": [3, 11], "x": 12, "y": 3.25},
-                {"matrix": [3, 12], "x": 13, "y": 3.25},
-                {"matrix": [3, 13], "x": 14, "y": 3.25},
-                {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
-                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
-                {"matrix": [4, 14], "x": 13.5, "y": 4.25},
-                {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25},
-                {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
-                {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 14], "x": 13.75, "y": 5.25},
-                {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
-                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/duck/tcv3/keyboard.json b/keyboards/duck/tcv3/keyboard.json
new file mode 100644
index 00000000000..c03142b4db2
--- /dev/null
+++ b/keyboards/duck/tcv3/keyboard.json
@@ -0,0 +1,289 @@
+{
+    "keyboard_name": "TC-V3",
+    "manufacturer": "Duck",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444B",
+        "pid": "0x5443",
+        "device_version": "0.0.1"
+    },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
+    "rgblight": {
+        "led_count": 17,
+        "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": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": false,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [0, 19], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25},
+                {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+                {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+                {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [0, 19], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+                {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+                {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk
index b13684d8fd9..8d6e39eef11 100644
--- a/keyboards/duck/tcv3/rules.mk
+++ b/keyboards/duck/tcv3/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes
-
 CUSTOM_MATRIX = yes
 SRC += indicator_leds.c \
 			 matrix.c duck_led/duck_led.c
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
deleted file mode 100644
index 9e82f76101e..00000000000
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-    "keyboard_name": "One 2 Mini",
-    "manufacturer": "Ducky",
-    "usb": {
-        "vid": "0x0416",
-        "pid": "0x0123",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
-        "rows": ["D11", "B4", "B5", "B6", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
-    },
-    "layout_aliases": {
-        "LAYOUT_iso": "LAYOUT_60_iso"
-    },
-    "community_layouts": ["60_ansi", "60_iso"],
-    "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, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ducky/one2mini/1861st/keyboard.json b/keyboards/ducky/one2mini/1861st/keyboard.json
new file mode 100644
index 00000000000..4d2b38955dc
--- /dev/null
+++ b/keyboards/ducky/one2mini/1861st/keyboard.json
@@ -0,0 +1,241 @@
+{
+    "keyboard_name": "One 2 Mini",
+    "manufacturer": "Ducky",
+    "usb": {
+        "vid": "0x0416",
+        "pid": "0x0123",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
+        "rows": ["D11", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true
+    },
+    "layout_aliases": {
+        "LAYOUT_iso": "LAYOUT_60_iso"
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
+    "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, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk
index b7db490c11e..5eb1c44f8a1 100644
--- a/keyboards/ducky/one2mini/1861st/rules.mk
+++ b/keyboards/ducky/one2mini/1861st/rules.mk
@@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0
 MCU  = cortex-m0
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 ARMV = 6
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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
-DIP_SWITCH_ENABLE = yes
-
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
deleted file mode 100644
index 3774be1bc06..00000000000
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-    "keyboard_name": "One 2 SF",
-    "manufacturer": "Ducky",
-    "maintainer": "f7urry",
-    "usb": {
-        "vid": "0x445B",
-        "pid": "0x07AF",
-        "device_version": "0.0.1",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
-        "rows": ["D11", "B4", "B5", "B6", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
-                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ducky/one2sf/1967st/keyboard.json b/keyboards/ducky/one2sf/1967st/keyboard.json
new file mode 100644
index 00000000000..3bb58fd48f3
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/keyboard.json
@@ -0,0 +1,265 @@
+{
+    "keyboard_name": "One 2 SF",
+    "manufacturer": "Ducky",
+    "maintainer": "f7urry",
+    "usb": {
+        "vid": "0x445B",
+        "pid": "0x07AF",
+        "device_version": "0.0.1",
+        "force_nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
+        "rows": ["D11", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "dip_switch": true
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk
index b7db490c11e..5eb1c44f8a1 100644
--- a/keyboards/ducky/one2sf/1967st/rules.mk
+++ b/keyboards/ducky/one2sf/1967st/rules.mk
@@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0
 MCU  = cortex-m0
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 ARMV = 6
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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
-DIP_SWITCH_ENABLE = yes
-
diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json
deleted file mode 100644
index faf59b7ecc9..00000000000
--- a/keyboards/dumbo/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "Dumbo",
-    "manufacturer": "trip_trap",
-    "url": "",
-    "maintainer": "adamnaldal",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x25E3",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
-        "rows": ["D4", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F4", "pin_b": "F5"},
-            {"pin_a": "C6", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F5", "pin_b": "F4"},
-                    {"pin_a": "B5", "pin_b": "C6"}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_split_3x6_4": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.25},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-                {"matrix": [0, 5], "x": 5, "y": 0.75},
-
-                {"matrix": [4, 5], "x": 9.5, "y": 0.75},
-                {"matrix": [4, 4], "x": 10.5, "y": 0.5},
-                {"matrix": [4, 3], "x": 11.5, "y": 0},
-                {"matrix": [4, 2], "x": 12.5, "y": 0.25},
-                {"matrix": [4, 1], "x": 13.5, "y": 1},
-                {"matrix": [4, 0], "x": 14.5, "y": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.25},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.75},
-
-                {"matrix": [5, 5], "x": 9.5, "y": 1.75},
-                {"matrix": [5, 4], "x": 10.5, "y": 1.5},
-                {"matrix": [5, 3], "x": 11.5, "y": 1},
-                {"matrix": [5, 2], "x": 12.5, "y": 1.25},
-                {"matrix": [5, 1], "x": 13.5, "y": 2},
-                {"matrix": [5, 0], "x": 14.5, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.25},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-                {"matrix": [2, 2], "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-                {"matrix": [2, 5], "x": 5, "y": 2.75},
-
-                {"matrix": [6, 5], "x": 9.5, "y": 2.75},
-                {"matrix": [6, 4], "x": 10.5, "y": 2.5},
-                {"matrix": [6, 3], "x": 11.5, "y": 2},
-                {"matrix": [6, 2], "x": 12.5, "y": 2.25},
-                {"matrix": [6, 1], "x": 13.5, "y": 3},
-                {"matrix": [6, 0], "x": 14.5, "y": 3.25},
-
-                {"matrix": [3, 2], "x": 3.25, "y": 3.75},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
-                {"matrix": [3, 5], "x": 6.25, "y": 4.25},
-
-                {"matrix": [7, 5], "x": 8.25, "y": 4.25},
-                {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
-                {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
-                {"matrix": [7, 2], "x": 11.25, "y": 3.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbo/keyboard.json b/keyboards/dumbo/keyboard.json
new file mode 100644
index 00000000000..84993a6b6d9
--- /dev/null
+++ b/keyboards/dumbo/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "Dumbo",
+    "manufacturer": "trip_trap",
+    "url": "",
+    "maintainer": "adamnaldal",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x25E3",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "F5"},
+            {"pin_a": "C6", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F5", "pin_b": "F4"},
+                    {"pin_a": "B5", "pin_b": "C6"}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_split_3x6_4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.75},
+
+                {"matrix": [4, 5], "x": 9.5, "y": 0.75},
+                {"matrix": [4, 4], "x": 10.5, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 2], "x": 12.5, "y": 0.25},
+                {"matrix": [4, 1], "x": 13.5, "y": 1},
+                {"matrix": [4, 0], "x": 14.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.75},
+
+                {"matrix": [5, 5], "x": 9.5, "y": 1.75},
+                {"matrix": [5, 4], "x": 10.5, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.5, "y": 1},
+                {"matrix": [5, 2], "x": 12.5, "y": 1.25},
+                {"matrix": [5, 1], "x": 13.5, "y": 2},
+                {"matrix": [5, 0], "x": 14.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.75},
+
+                {"matrix": [6, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [6, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.5, "y": 2},
+                {"matrix": [6, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 1], "x": 13.5, "y": 3},
+                {"matrix": [6, 0], "x": 14.5, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 4.25},
+
+                {"matrix": [7, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 2], "x": 11.25, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk
deleted file mode 100644
index 6364de07d9b..00000000000
--- a/keyboards/dumbo/rules.mk
+++ /dev/null
@@ -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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
deleted file mode 100644
index 84594e01afe..00000000000
--- a/keyboards/dumbpad/v0x/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.7"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D0", "pin_b": "D4"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 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, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v0x/keyboard.json b/keyboards/dumbpad/v0x/keyboard.json
new file mode 100644
index 00000000000..f0cecd80638
--- /dev/null
+++ b/keyboards/dumbpad/v0x/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.0.7"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D4"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 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, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v0x/rules.mk b/keyboards/dumbpad/v0x/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
deleted file mode 100644
index a841d9d6425..00000000000
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.6"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C6", "pin_b": "D4"},
-            {"pin_a": "D0", "pin_b": "D1"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 0]
-    },
-    "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": [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/dumbpad/v0x_dualencoder/keyboard.json b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
new file mode 100644
index 00000000000..71b501cedd5
--- /dev/null
+++ b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.0.6"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C6", "pin_b": "D4"},
+            {"pin_a": "D0", "pin_b": "D1"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [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/dumbpad/v0x_dualencoder/rules.mk b/keyboards/dumbpad/v0x_dualencoder/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x_dualencoder/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
deleted file mode 100644
index d0530abd7d1..00000000000
--- a/keyboards/dumbpad/v0x_right/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.7"
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B4", "E6", "D7", "C6"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D4", "pin_b": "D0"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 4]
-    },
-    "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": [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},
-                {"matrix": [3, 4], "x": 4, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v0x_right/keyboard.json b/keyboards/dumbpad/v0x_right/keyboard.json
new file mode 100644
index 00000000000..883f2f785d7
--- /dev/null
+++ b/keyboards/dumbpad/v0x_right/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.0.7"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "D0"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 4]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [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},
+                {"matrix": [3, 4], "x": 4, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v0x_right/rules.mk b/keyboards/dumbpad/v0x_right/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x_right/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
deleted file mode 100644
index f790bb80ecd..00000000000
--- a/keyboards/dumbpad/v1x/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "D4"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 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, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v1x/keyboard.json b/keyboards/dumbpad/v1x/keyboard.json
new file mode 100644
index 00000000000..9ab78e1a9f1
--- /dev/null
+++ b/keyboards/dumbpad/v1x/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "D4"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 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, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v1x/rules.mk b/keyboards/dumbpad/v1x/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
deleted file mode 100644
index ad16fa4417a..00000000000
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "D4"},
-            {"pin_a": "D0", "pin_b": "D1"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 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, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v1x_dualencoder/keyboard.json b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
new file mode 100644
index 00000000000..f3aeafe6252
--- /dev/null
+++ b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
@@ -0,0 +1,55 @@
+{
+    "usb": {
+        "device_version": "0.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "D4"},
+            {"pin_a": "D0", "pin_b": "D1"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 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, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v1x_dualencoder/rules.mk b/keyboards/dumbpad/v1x_dualencoder/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x_dualencoder/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json
deleted file mode 100644
index b4dd15c76b7..00000000000
--- a/keyboards/dumbpad/v1x_oled/info.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "B1", "B3", "B2", "B6"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"},
-            {"pin_a": "E6", "pin_b": "D7"}
-        ]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 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, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v1x_oled/keyboard.json b/keyboards/dumbpad/v1x_oled/keyboard.json
new file mode 100644
index 00000000000..3a437699b86
--- /dev/null
+++ b/keyboards/dumbpad/v1x_oled/keyboard.json
@@ -0,0 +1,52 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B1", "B3", "B2", "B6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"},
+            {"pin_a": "E6", "pin_b": "D7"}
+        ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "encoder": true,
+        "oled": true,
+        "wpm": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 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, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk
deleted file mode 100644
index 53db407bc36..00000000000
--- a/keyboards/dumbpad/v1x_oled/rules.mk
+++ /dev/null
@@ -1,16 +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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
deleted file mode 100644
index 55b898b701a..00000000000
--- a/keyboards/dumbpad/v1x_right/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B4", "E6", "D7", "C6"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D4", "pin_b": "B2"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 4]
-    },
-    "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": [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},
-                {"matrix": [3, 4], "x": 4, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v1x_right/keyboard.json b/keyboards/dumbpad/v1x_right/keyboard.json
new file mode 100644
index 00000000000..583d60bc5d2
--- /dev/null
+++ b/keyboards/dumbpad/v1x_right/keyboard.json
@@ -0,0 +1,54 @@
+{
+    "usb": {
+        "device_version": "0.1.0"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "B2"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 4]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "encoder": true,
+        "key_lock": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [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},
+                {"matrix": [3, 4], "x": 4, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x_right/rules.mk
+++ /dev/null
@@ -1,15 +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 = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
deleted file mode 100644
index 4dc17272a95..00000000000
--- a/keyboards/dumbpad/v3x/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "keyboard_name": "dumbpad/v3x",
-    "url": "https://www.github.com/imchipwood/dumbpad",
-    "maintainer": "imchipwood",
-    "usb": {
-        "device_version": "0.1.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_spiral_val": true,
-            "cycle_left_right": true,
-            "cycle_pinwheel": true,
-            "raindrops": true,
-            "jellybean_raindrops": 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",
-        "timeout": 300000,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "D4"}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [3, 0]
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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, 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, 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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dumbpad/v3x/keyboard.json b/keyboards/dumbpad/v3x/keyboard.json
new file mode 100644
index 00000000000..7ea29cd9ad3
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keyboard.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "dumbpad/v3x",
+    "url": "https://www.github.com/imchipwood/dumbpad",
+    "maintainer": "imchipwood",
+    "usb": {
+        "device_version": "0.1.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_spiral_val": true,
+            "cycle_left_right": true,
+            "cycle_pinwheel": true,
+            "raindrops": true,
+            "jellybean_raindrops": 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",
+        "timeout": 300000,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "D4"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "encoder": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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, 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, 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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk
deleted file mode 100644
index 11f04a3adec..00000000000
--- a/keyboards/dumbpad/v3x/rules.mk
+++ /dev/null
@@ -1,16 +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
-
-ENCODER_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/durgod/dgk6x/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c
index 649821c5f23..b7f1da778d9 100644
--- a/keyboards/durgod/dgk6x/dgk6x.c
+++ b/keyboards/durgod/dgk6x/dgk6x.c
@@ -41,7 +41,7 @@ void led_init_ports(void) {
 #ifndef WINLOCK_DISABLED
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case GUI_TOG:
+        case GU_TOGG:
             if (record->event.pressed) {
                 // Toggle LED on key press
                 togglePin(LED_WIN_LOCK_PIN);
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index 1cf2d712558..5d08163109a 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
index c40cfac3030..83b285786d6 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json
@@ -17,7 +17,7 @@
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",                       "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG",
diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
index e8073ff800d..7cd7bd3d325 100644
--- a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json
@@ -17,7 +17,7 @@
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",                       "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG",
diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
index e984c36d911..d092310814b 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
index e3b969149ac..fc2a11b35cd 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",             "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
index 7c25f6efb07..82c3d528327 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",             "KC_TRNS", "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
index 5ccc60e841e..dcd821803e9 100644
--- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
+++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json
index 774c010206a..f3ecd2cc9b6 100644
--- a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS",            "KC_TRNS",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",  "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json
index c9d5e7b843d..cffa5affd91 100644
--- a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS",            "KC_TRNS",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",  "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index b8d38e2d9f9..d036bc06308 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -54,5 +54,15 @@
     },
     "processor": "STM32F072", // F070
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
     "board": "DURGOD_STM32_F070"
 }
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index 36a93aa827b..597f5bbcf9e 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -1,20 +1,4 @@
 # Do not put the microcontroller into power saving mode
 NO_SUSPEND_POWER_DOWN = yes
 
-# 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
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
 DEFAULT_FOLDER=durgod/dgk6x/hades_ansi
diff --git a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
index e7ef2e9d4bf..ff3f85d9e48 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS",  "KC_HOME", "KC_END",  "KC_DEL",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN",            "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD",
diff --git a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
index fd456255341..0243dc33ddb 100644
--- a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json
@@ -15,7 +15,7 @@
       "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS",  "KC_HOME", "KC_END",  "KC_DEL",
       "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN",            "KC_TRNS",
       "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
-      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS"
+      "KC_TRNS", "GU_TOGG", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "MO(3)",   "KC_TRNS"
     ],
     [
       "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD",
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 9bde901374b..5433266e3ba 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json
deleted file mode 100644
index 6047c40fc05..00000000000
--- a/keyboards/durgod/k310/base/info.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
-        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
-    },
-    "diode_direction": "ROW2COL",
-    "indicators": {
-        "caps_lock": "C9",
-        "num_lock": "C8",
-        "scroll_lock": "A8",
-        "on_state": 0
-    },
-    "processor": "STM32F072", // F070
-    "bootloader": "stm32-dfu",
-    "board": "DURGOD_STM32_F070"
-}
diff --git a/keyboards/durgod/k310/base/keyboard.json b/keyboards/durgod/k310/base/keyboard.json
new file mode 100644
index 00000000000..94dae4d8097
--- /dev/null
+++ b/keyboards/durgod/k310/base/keyboard.json
@@ -0,0 +1,25 @@
+{
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
+    },
+    "diode_direction": "ROW2COL",
+    "indicators": {
+        "caps_lock": "C9",
+        "num_lock": "C8",
+        "scroll_lock": "A8",
+        "on_state": 0
+    },
+    "processor": "STM32F072", // F070
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true
+    },
+    "build": {
+        "lto": true
+    },
+    "board": "DURGOD_STM32_F070"
+}
diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk
index 454cf102ec2..0ab54aaaf71 100644
--- a/keyboards/durgod/k310/base/rules.mk
+++ b/keyboards/durgod/k310/base/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = 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
-LTO_ENABLE = yes
diff --git a/keyboards/durgod/k310/k310.c b/keyboards/durgod/k310/k310.c
index cf2b618158f..a88100be20b 100644
--- a/keyboards/durgod/k310/k310.c
+++ b/keyboards/durgod/k310/k310.c
@@ -55,7 +55,7 @@ void led_init_ports(void) {
 #ifndef WINLOCK_DISABLED
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case GUI_TOG:
+        case GU_TOGG:
             if (record->event.pressed) {
                 // Toggle LED on key press
                 togglePin(LED_WIN_LOCK_PIN);
diff --git a/keyboards/durgod/k310/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json
index 7b9c0e7efbe..1731eca6ede 100644
--- a/keyboards/durgod/k310/keymaps/default/keymap.json
+++ b/keyboards/durgod/k310/keymaps/default/keymap.json
@@ -17,7 +17,7 @@
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",                                        "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",            "_______",               "_______",               "_______", "_______", "_______", "_______",
-      "_______", "GUI_TOG", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______",            "_______"
+      "_______", "GU_TOGG", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______",    "_______",            "_______"
     ]
   ],
   "author": "tylert",
diff --git a/keyboards/durgod/k310/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c
index c2f0ebd65f3..11d50c93823 100644
--- a/keyboards/durgod/k310/keymaps/via/keymap.c
+++ b/keyboards/durgod/k310/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                  _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,             _______, _______, _______, _______,
-      _______, GUI_TOG, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
+      _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______,    _______,          _______
   ),
   [_LAYER3] = LAYOUT_all( /* Layer 3 */
       _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c
index 98527ba1b58..c1b9701d7b7 100644
--- a/keyboards/durgod/k320/k320.c
+++ b/keyboards/durgod/k320/k320.c
@@ -55,7 +55,7 @@ void led_init_ports(void) {
 #ifndef WINLOCK_DISABLED
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case GUI_TOG:
+        case GU_TOGG:
             if (record->event.pressed) {
                 // Toggle LED on key press
                 togglePin(LED_WIN_LOCK_PIN);
diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json
index f3bc38a49b1..ba474f40443 100644
--- a/keyboards/durgod/k320/keymaps/default/keymap.json
+++ b/keyboards/durgod/k320/keymaps/default/keymap.json
@@ -17,7 +17,7 @@
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",            "_______",               "_______",
-      "_______", "GUI_TOG", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______"
+      "_______", "GU_TOGG", "_______",                                  "_______",                                  "_______", "_______", "_______", "_______",    "_______", "_______", "_______"
     ]
   ],
   "author": "tylert",
diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c
index f91e752a292..7597089d0cb 100644
--- a/keyboards/durgod/k320/keymaps/via/keymap.c
+++ b/keyboards/durgod/k320/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
-      _______, GUI_TOG, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
+      _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
   ),
   [_LAYER3] = LAYOUT_all( /* Layer 3 */
       _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index 8a6945567a1..26edee65b97 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -144,12 +144,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // always enable num lock on layer NL and disable on other layers
 // thanks to spidey3 & Erovia on discord
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
deleted file mode 100644
index 8a9801c4f30..00000000000
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1120",
-        "device_version": "1.0.0"
-    },
-    "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,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3733",
-        "led_process_limit": 4,
-        "led_flush_limit": 26,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
-        "rows": ["B1", "B10", "B11", "B14", "B12"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v1/keyboard.json b/keyboards/dztech/dz60rgb/v1/keyboard.json
new file mode 100644
index 00000000000..fa82578c766
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "usb": {
+        "pid": "0x1120",
+        "device_version": "1.0.0"
+    },
+    "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,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "board": "QMK_PROTON_C",
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/dztech/dz60rgb/v1/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
deleted file mode 100644
index c3e1837dbd3..00000000000
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1121",
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v2/keyboard.json b/keyboards/dztech/dz60rgb/v2/keyboard.json
new file mode 100644
index 00000000000..710f86e04c5
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2/keyboard.json
@@ -0,0 +1,55 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.0.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/dztech/dz60rgb/v2/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
deleted file mode 100644
index 1d97037c311..00000000000
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1121",
-        "device_version": "2.1.0"
-    },
-    "rgb_matrix": {
-        "animations":{
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v2_1/keyboard.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
new file mode 100644
index 00000000000..7678e9985c9
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
@@ -0,0 +1,59 @@
+{
+    "usb": {
+        "pid": "0x1121",
+        "device_version": "2.1.0"
+    },
+    "rgb_matrix": {
+        "animations":{
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "space_cadet": false,
+        "grave_esc": false
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk
index 832eb95f50f..13252d81696 100644
--- a/keyboards/dztech/dz60rgb/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk
@@ -1,20 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-LTO_ENABLE = yes
-
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
deleted file mode 100644
index d09c967d008..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1220",
-        "device_version": "1.0.0"
-    },
-    "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,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3733",
-        "led_process_limit": 4,
-        "led_flush_limit": 26,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
-        "rows": ["B1", "B10", "B11", "B14", "B12"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json
new file mode 100644
index 00000000000..de0229c1512
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "usb": {
+        "pid": "0x1220",
+        "device_version": "1.0.0"
+    },
+    "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,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "board": "QMK_PROTON_C",
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
deleted file mode 100644
index 5769daefef2..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1221",
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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_splash": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json
new file mode 100644
index 00000000000..9a4a11ffdc6
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json
@@ -0,0 +1,60 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.0.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
deleted file mode 100644
index 17e0aea48d8..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
+++ /dev/null
@@ -1,16 +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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
deleted file mode 100644
index 649ea2e2611..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1221",
-        "device_version": "2.1.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
new file mode 100644
index 00000000000..9d3b1efeac1
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "usb": {
+        "pid": "0x1221",
+        "device_version": "2.1.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
index a89963c2d40..13252d81696 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
@@ -1,16 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
deleted file mode 100644
index 320d412aaef..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1320",
-        "device_version": "1.0.0"
-    },
-    "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,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3733",
-        "led_process_limit": 4,
-        "led_flush_limit": 26,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
-        "rows": ["B1", "B10", "B11", "B14", "B12"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json
new file mode 100644
index 00000000000..c0b78aa8a9f
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+    "usb": {
+        "pid": "0x1320",
+        "device_version": "1.0.0"
+    },
+    "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,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+        "rows": ["B1", "B10", "B11", "B14", "B12"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "board": "QMK_PROTON_C",
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
deleted file mode 100644
index f7d6acff0c7..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1321",
-        "device_version": "2.0.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "typing_heatmap": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_splash": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json
new file mode 100644
index 00000000000..fd095b548a5
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json
@@ -0,0 +1,53 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.0.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
deleted file mode 100644
index 5a3cc636024..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1321",
-        "device_version": "2.1.0"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "typing_heatmap": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_splash": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
new file mode 100644
index 00000000000..968488e5449
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
@@ -0,0 +1,57 @@
+{
+    "usb": {
+        "pid": "0x1321",
+        "device_version": "2.1.0"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_splash": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
index a89963c2d40..13252d81696 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
@@ -1,16 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-AUDIO_ENABLE = no              # Audio output
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
deleted file mode 100644
index b568170e14d..00000000000
--- a/keyboards/dztech/dz64rgb/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "keyboard_name": "DZ64RGB",
-    "manufacturer": "DZTECH",
-    "url": "",
-    "maintainer": "moyi4681",
-    "usb": {
-        "vid": "0x445A",
-        "pid": "0x1013",
-        "device_version": "0.0.2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
-        "rows": ["F5", "F4", "F1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "layouts": {
-        "LAYOUT_64_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dztech/dz64rgb/keyboard.json b/keyboards/dztech/dz64rgb/keyboard.json
new file mode 100644
index 00000000000..ea22af59db9
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/keyboard.json
@@ -0,0 +1,138 @@
+{
+    "keyboard_name": "DZ64RGB",
+    "manufacturer": "DZTECH",
+    "url": "",
+    "maintainer": "moyi4681",
+    "usb": {
+        "vid": "0x445A",
+        "pid": "0x1013",
+        "device_version": "0.0.2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+        "rows": ["F5", "F4", "F1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "community_layouts": ["64_ansi"],
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk
deleted file mode 100644
index a20c8b449f7..00000000000
--- a/keyboards/dztech/dz64rgb/rules.mk
+++ /dev/null
@@ -1,15 +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
-LTO_ENABLE = yes
-LAYOUT= 64_ansi
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
deleted file mode 100644
index ea7390ee9ee..00000000000
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "usb": {
-        "pid": "0x1424",
-        "device_version": "3.0.0"
-    },
-    "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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "led_process_limit": 4,
-        "led_flush_limit": 26,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
-        "rows": ["F0", "F1", "F4", "E6", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/dztech/dz65rgb/v3/keyboard.json b/keyboards/dztech/dz65rgb/v3/keyboard.json
new file mode 100644
index 00000000000..8fef8b34683
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/v3/keyboard.json
@@ -0,0 +1,155 @@
+{
+    "usb": {
+        "pid": "0x1424",
+        "device_version": "3.0.0"
+    },
+    "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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_process_limit": 4,
+        "led_flush_limit": 26,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "F1", "F4", "E6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk
index bbe22adb0c5..13252d81696 100755
--- a/keyboards/dztech/dz65rgb/v3/rules.mk
+++ b/keyboards/dztech/dz65rgb/v3/rules.mk
@@ -1,16 +1 @@
 BOOTLOADER_SIZE = 6144
-
-# 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        # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json
index 74c66fdcb91..6a1b2adda1b 100644
--- a/keyboards/eco/info.json
+++ b/keyboards/eco/info.json
@@ -3,16 +3,6 @@
   "manufacturer": "Bishop Keyboards",
   "url": "",
   "maintainer": "qmk",
-  "features": {
-    "backlight": true,
-    "bootmagic": false,
-    "command": true,
-    "console": false,
-    "extrakey": true,
-    "midi": true,
-    "mousekey": false,
-    "nkro": false
-  },
   "usb": {
     "vid": "0x1337",
     "pid": "0x6006"
diff --git a/keyboards/eco/keymaps/default/keymap.c b/keyboards/eco/keymaps/default/keymap.c
index 8867e11124f..096d955e85b 100644
--- a/keyboards/eco/keymaps/default/keymap.c
+++ b/keyboards/eco/keymaps/default/keymap.c
@@ -13,10 +13,6 @@
 #define _FN1 2
 #define _FN2 3
 
-enum eco_keycodes {
-  QWERTY = SAFE_RANGE
-};
-
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
@@ -78,20 +74,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 
 };
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json
deleted file mode 100644
index f2a7842ce40..00000000000
--- a/keyboards/eco/rev1/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
-        "rows": ["B1", "B6", "B2", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "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, 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": [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": [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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/eco/rev1/keyboard.json b/keyboards/eco/rev1/keyboard.json
new file mode 100644
index 00000000000..1b3cb5f8dfb
--- /dev/null
+++ b/keyboards/eco/rev1/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+        "rows": ["B1", "B6", "B2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": false,
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "midi": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "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, 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": [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": [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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/eco/rev1/rules.mk b/keyboards/eco/rev1/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/eco/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json
deleted file mode 100644
index 8148e78f859..00000000000
--- a/keyboards/eco/rev2/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
-        "rows": ["D7", "B5", "B4", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "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, 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": [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": [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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/eco/rev2/keyboard.json b/keyboards/eco/rev2/keyboard.json
new file mode 100644
index 00000000000..8effdd85e5b
--- /dev/null
+++ b/keyboards/eco/rev2/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
+        "rows": ["D7", "B5", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": false,
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "midi": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "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, 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": [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": [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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/eco/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
deleted file mode 100644
index 89b008296bc..00000000000
--- a/keyboards/edi/hardlight/mk1/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Enable Audio Subsystem with two voices
- */
-// #define AUDIO_PIN C6
diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json
index 7f33c262278..3cb07cb2f18 100644
--- a/keyboards/edi/hardlight/mk1/keyboard.json
+++ b/keyboards/edi/hardlight/mk1/keyboard.json
@@ -16,6 +16,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
         "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 52636c6484e..bd604db6846 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
 
 /* PWM RGB Underglow Defines */
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
deleted file mode 100644
index 2be212702ac..00000000000
--- a/keyboards/edi/hardlight/mk2/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "Hard Light Mk 2",
-    "manufacturer": "Everywhere Defense Industries",
-    "usb": {
-        "vid": "0xF7E0",
-        "pid": "0x2408",
-        "device_version": "0.0.7"
-    },
-    "rgblight": {
-        "led_count": 32,
-        "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": "A10",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
-        "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["ortho_4x16"],
-    "layouts": {
-        "LAYOUT_ortho_4x16": {
-            "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": [1, 6], "x": 13, "y": 0},
-                {"matrix": [0, 7], "x": 14, "y": 0},
-                {"matrix": [1, 7], "x": 15, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [3, 0], "x": 1, "y": 1},
-                {"matrix": [2, 1], "x": 2, "y": 1},
-                {"matrix": [3, 1], "x": 3, "y": 1},
-                {"matrix": [2, 2], "x": 4, "y": 1},
-                {"matrix": [3, 2], "x": 5, "y": 1},
-                {"matrix": [2, 3], "x": 6, "y": 1},
-                {"matrix": [3, 3], "x": 7, "y": 1},
-                {"matrix": [2, 4], "x": 8, "y": 1},
-                {"matrix": [3, 4], "x": 9, "y": 1},
-                {"matrix": [2, 5], "x": 10, "y": 1},
-                {"matrix": [3, 5], "x": 11, "y": 1},
-                {"matrix": [2, 6], "x": 12, "y": 1},
-                {"matrix": [3, 6], "x": 13, "y": 1},
-                {"matrix": [2, 7], "x": 14, "y": 1},
-                {"matrix": [3, 7], "x": 15, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-                {"matrix": [4, 1], "x": 2, "y": 2},
-                {"matrix": [5, 1], "x": 3, "y": 2},
-                {"matrix": [4, 2], "x": 4, "y": 2},
-                {"matrix": [5, 2], "x": 5, "y": 2},
-                {"matrix": [4, 3], "x": 6, "y": 2},
-                {"matrix": [5, 3], "x": 7, "y": 2},
-                {"matrix": [4, 4], "x": 8, "y": 2},
-                {"matrix": [5, 4], "x": 9, "y": 2},
-                {"matrix": [4, 5], "x": 10, "y": 2},
-                {"matrix": [5, 5], "x": 11, "y": 2},
-                {"matrix": [4, 6], "x": 12, "y": 2},
-                {"matrix": [5, 6], "x": 13, "y": 2},
-                {"matrix": [4, 7], "x": 14, "y": 2},
-                {"matrix": [5, 7], "x": 15, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-                {"matrix": [6, 1], "x": 2, "y": 3},
-                {"matrix": [7, 1], "x": 3, "y": 3},
-                {"matrix": [6, 2], "x": 4, "y": 3},
-                {"matrix": [7, 2], "x": 5, "y": 3},
-                {"matrix": [6, 3], "x": 6, "y": 3},
-                {"matrix": [7, 3], "x": 7, "y": 3},
-                {"matrix": [6, 4], "x": 8, "y": 3},
-                {"matrix": [7, 4], "x": 9, "y": 3},
-                {"matrix": [6, 5], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-                {"matrix": [6, 6], "x": 12, "y": 3},
-                {"matrix": [7, 6], "x": 13, "y": 3},
-                {"matrix": [6, 7], "x": 14, "y": 3},
-                {"matrix": [7, 7], "x": 15, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/edi/hardlight/mk2/keyboard.json b/keyboards/edi/hardlight/mk2/keyboard.json
new file mode 100644
index 00000000000..a1f47aabf5a
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "Hard Light Mk 2",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2408",
+        "device_version": "0.0.7"
+    },
+    "rgblight": {
+        "led_count": 32,
+        "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": "A10",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
+        "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true,
+        "velocikey": true,
+        "key_lock": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["ortho_4x16"],
+    "layouts": {
+        "LAYOUT_ortho_4x16": {
+            "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": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 7], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+                {"matrix": [5, 6], "x": 13, "y": 2},
+                {"matrix": [4, 7], "x": 14, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [7, 6], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index b7b67ba5b2b..0ab54aaaf71 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -1,18 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-VELOCIKEY_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
deleted file mode 100644
index 745710f92f3..00000000000
--- a/keyboards/edinburgh41/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "manufacturer": "L. Mistry",
-    "keyboard_name": "edinburgh41",
-    "maintainer": "schwarzer-geiger",
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
-    "url": "https://github.com/schwarzer-geiger/Edinburgh41",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0000",
-        "vid": "0xFEED"
-    },
-    "rgblight": {
-        "led_count": 10
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.54},
-                {"matrix": [0, 1], "x": 1, "y": 0.36},
-                {"matrix": [0, 2], "x": 2, "y": 0.18},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.18},
-                {"matrix": [0, 5], "x": 5, "y": 0.36},
-
-                {"matrix": [3, 0], "x": 7, "y": 0.36},
-                {"matrix": [3, 1], "x": 8, "y": 0.18},
-                {"matrix": [3, 2], "x": 9, "y": 0},
-                {"matrix": [3, 3], "x": 10, "y": 0.18},
-                {"matrix": [3, 4], "x": 11, "y": 0.36},
-                {"matrix": [3, 5], "x": 12, "y": 0.54},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.54},
-                {"matrix": [1, 1], "x": 1, "y": 1.36},
-                {"matrix": [1, 2], "x": 2, "y": 1.18},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.18},
-                {"matrix": [1, 5], "x": 5, "y": 1.36},
-
-                {"matrix": [4, 0], "x": 7, "y": 1.36},
-                {"matrix": [4, 1], "x": 8, "y": 1.18},
-                {"matrix": [4, 2], "x": 9, "y": 1},
-                {"matrix": [4, 3], "x": 10, "y": 1.18},
-                {"matrix": [4, 4], "x": 11, "y": 1.36},
-                {"matrix": [4, 5], "x": 12, "y": 1.54},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.54},
-                {"matrix": [2, 1], "x": 1, "y": 2.36},
-                {"matrix": [2, 2], "x": 2, "y": 2.18},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.18},
-                {"matrix": [2, 5], "x": 5, "y": 2.36},
-
-                {"matrix": [5, 0], "x": 7, "y": 2.36},
-                {"matrix": [5, 1], "x": 8, "y": 2.18},
-                {"matrix": [5, 2], "x": 9, "y": 2},
-                {"matrix": [5, 3], "x": 10, "y": 2.18},
-                {"matrix": [5, 4], "x": 11, "y": 2.36},
-                {"matrix": [5, 5], "x": 12, "y": 2.54},
-
-                {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
-                {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
-                {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
-                {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
-                {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/edinburgh41/keyboard.json b/keyboards/edinburgh41/keyboard.json
new file mode 100644
index 00000000000..374f10b2b77
--- /dev/null
+++ b/keyboards/edinburgh41/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "manufacturer": "L. Mistry",
+    "keyboard_name": "edinburgh41",
+    "maintainer": "schwarzer-geiger",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true,
+        "pointing_device": true
+    },
+    "url": "https://github.com/schwarzer-geiger/Edinburgh41",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "rgblight": {
+        "led_count": 10
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.54},
+                {"matrix": [0, 1], "x": 1, "y": 0.36},
+                {"matrix": [0, 2], "x": 2, "y": 0.18},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.18},
+                {"matrix": [0, 5], "x": 5, "y": 0.36},
+
+                {"matrix": [3, 0], "x": 7, "y": 0.36},
+                {"matrix": [3, 1], "x": 8, "y": 0.18},
+                {"matrix": [3, 2], "x": 9, "y": 0},
+                {"matrix": [3, 3], "x": 10, "y": 0.18},
+                {"matrix": [3, 4], "x": 11, "y": 0.36},
+                {"matrix": [3, 5], "x": 12, "y": 0.54},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.54},
+                {"matrix": [1, 1], "x": 1, "y": 1.36},
+                {"matrix": [1, 2], "x": 2, "y": 1.18},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.18},
+                {"matrix": [1, 5], "x": 5, "y": 1.36},
+
+                {"matrix": [4, 0], "x": 7, "y": 1.36},
+                {"matrix": [4, 1], "x": 8, "y": 1.18},
+                {"matrix": [4, 2], "x": 9, "y": 1},
+                {"matrix": [4, 3], "x": 10, "y": 1.18},
+                {"matrix": [4, 4], "x": 11, "y": 1.36},
+                {"matrix": [4, 5], "x": 12, "y": 1.54},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.54},
+                {"matrix": [2, 1], "x": 1, "y": 2.36},
+                {"matrix": [2, 2], "x": 2, "y": 2.18},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.18},
+                {"matrix": [2, 5], "x": 5, "y": 2.36},
+
+                {"matrix": [5, 0], "x": 7, "y": 2.36},
+                {"matrix": [5, 1], "x": 8, "y": 2.18},
+                {"matrix": [5, 2], "x": 9, "y": 2},
+                {"matrix": [5, 3], "x": 10, "y": 2.18},
+                {"matrix": [5, 4], "x": 11, "y": 2.36},
+                {"matrix": [5, 5], "x": 12, "y": 2.54},
+
+                {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
+                {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
+                {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/edinburgh41/rules.mk b/keyboards/edinburgh41/rules.mk
index bf33c793b6b..c76a8bf8a18 100644
--- a/keyboards/edinburgh41/rules.mk
+++ b/keyboards/edinburgh41/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = analog_joystick
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
deleted file mode 100644
index 46a265902c4..00000000000
--- a/keyboards/efreet/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Amber Holly
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
deleted file mode 100644
index b7749ed3419..00000000000
--- a/keyboards/efreet/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "Efreet",
-    "manufacturer": "Soran",
-    "url": "",
-    "maintainer": "amberstarlight",
-    "usb": {
-        "vid": "0x534F",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B3", "B4", "B5", "B6", "B7", "C7"],
-        "rows": ["B0", "D6", "D5", "D4", "D3", "D2", "D1", "C2"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "driver": "timer",
-        "pin": "D0",
-        "breathing": true
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12", "planck_mit"],
-    "layouts": {
-        "LAYOUT_planck_mit": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [1, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-                {"matrix": [1, 3], "x": 6, "y": 0},
-                {"matrix": [0, 3], "x": 7, "y": 0},
-                {"matrix": [1, 4], "x": 8, "y": 0},
-                {"matrix": [0, 4], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [3, 0], "x": 0, "y": 1},
-                {"matrix": [2, 0], "x": 1, "y": 1},
-                {"matrix": [3, 1], "x": 2, "y": 1},
-                {"matrix": [2, 1], "x": 3, "y": 1},
-                {"matrix": [3, 2], "x": 4, "y": 1},
-                {"matrix": [2, 2], "x": 5, "y": 1},
-                {"matrix": [3, 3], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 4], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 5], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-
-                {"matrix": [5, 0], "x": 0, "y": 2},
-                {"matrix": [4, 0], "x": 1, "y": 2},
-                {"matrix": [5, 1], "x": 2, "y": 2},
-                {"matrix": [4, 1], "x": 3, "y": 2},
-                {"matrix": [5, 2], "x": 4, "y": 2},
-                {"matrix": [4, 2], "x": 5, "y": 2},
-                {"matrix": [5, 3], "x": 6, "y": 2},
-                {"matrix": [4, 3], "x": 7, "y": 2},
-                {"matrix": [5, 4], "x": 8, "y": 2},
-                {"matrix": [4, 4], "x": 9, "y": 2},
-                {"matrix": [5, 5], "x": 10, "y": 2},
-                {"matrix": [4, 5], "x": 11, "y": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3},
-                {"matrix": [6, 0], "x": 1, "y": 3},
-                {"matrix": [7, 1], "x": 2, "y": 3},
-                {"matrix": [6, 1], "x": 3, "y": 3},
-                {"matrix": [7, 2], "x": 4, "y": 3},
-                {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
-                {"matrix": [6, 3], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [6, 4], "x": 9, "y": 3},
-                {"matrix": [7, 5], "x": 10, "y": 3},
-                {"matrix": [6, 5], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "y": 0},
-                {"matrix": [1, 1], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [1, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-                {"matrix": [1, 3], "x": 6, "y": 0},
-                {"matrix": [0, 3], "x": 7, "y": 0},
-                {"matrix": [1, 4], "x": 8, "y": 0},
-                {"matrix": [0, 4], "x": 9, "y": 0},
-                {"matrix": [1, 5], "x": 10, "y": 0},
-                {"matrix": [0, 5], "x": 11, "y": 0},
-
-                {"matrix": [3, 0], "x": 0, "y": 1},
-                {"matrix": [2, 0], "x": 1, "y": 1},
-                {"matrix": [3, 1], "x": 2, "y": 1},
-                {"matrix": [2, 1], "x": 3, "y": 1},
-                {"matrix": [3, 2], "x": 4, "y": 1},
-                {"matrix": [2, 2], "x": 5, "y": 1},
-                {"matrix": [3, 3], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 4], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 5], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-
-                {"matrix": [5, 0], "x": 0, "y": 2},
-                {"matrix": [4, 0], "x": 1, "y": 2},
-                {"matrix": [5, 1], "x": 2, "y": 2},
-                {"matrix": [4, 1], "x": 3, "y": 2},
-                {"matrix": [5, 2], "x": 4, "y": 2},
-                {"matrix": [4, 2], "x": 5, "y": 2},
-                {"matrix": [5, 3], "x": 6, "y": 2},
-                {"matrix": [4, 3], "x": 7, "y": 2},
-                {"matrix": [5, 4], "x": 8, "y": 2},
-                {"matrix": [4, 4], "x": 9, "y": 2},
-                {"matrix": [5, 5], "x": 10, "y": 2},
-                {"matrix": [4, 5], "x": 11, "y": 2},
-
-                {"matrix": [7, 0], "x": 0, "y": 3},
-                {"matrix": [6, 0], "x": 1, "y": 3},
-                {"matrix": [7, 1], "x": 2, "y": 3},
-                {"matrix": [6, 1], "x": 3, "y": 3},
-                {"matrix": [7, 2], "x": 4, "y": 3},
-                {"matrix": [6, 2], "x": 5, "y": 3},
-                {"matrix": [7, 3], "x": 6, "y": 3},
-                {"matrix": [6, 3], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [6, 4], "x": 9, "y": 3},
-                {"matrix": [7, 5], "x": 10, "y": 3},
-                {"matrix": [6, 5], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/efreet/keyboard.json b/keyboards/efreet/keyboard.json
new file mode 100644
index 00000000000..7dac78cc397
--- /dev/null
+++ b/keyboards/efreet/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "Efreet",
+    "manufacturer": "Soran",
+    "url": "",
+    "maintainer": "amberstarlight",
+    "usb": {
+        "vid": "0x534F",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B3", "B4", "B5", "B6", "B7", "C7"],
+        "rows": ["B0", "D6", "D5", "D4", "D3", "D2", "D1", "C2"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "driver": "timer",
+        "pin": "D0",
+        "breathing": true
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layouts": {
+        "LAYOUT_planck_mit": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 2], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 3], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 4], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 5], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 1], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 1], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 2], "x": 4, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [6, 4], "x": 9, "y": 3},
+                {"matrix": [7, 5], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 3], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 4], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 5], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 1], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 2], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 3], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 4], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [3, 5], "x": 10, "y": 1},
+                {"matrix": [2, 5], "x": 11, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 1], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 4], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 1], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 2], "x": 4, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3},
+                {"matrix": [7, 3], "x": 6, "y": 3},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [6, 4], "x": 9, "y": 3},
+                {"matrix": [7, 5], "x": 10, "y": 3},
+                {"matrix": [6, 5], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/efreet/rules.mk b/keyboards/efreet/rules.mk
index f82a86f3e3a..09057bea54b 100644
--- a/keyboards/efreet/rules.mk
+++ b/keyboards/efreet/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json
similarity index 100%
rename from keyboards/elcantorhs/info.json
rename to keyboards/elcantorhs/keyboard.json
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
deleted file mode 100644
index 1bc39ced986..00000000000
--- a/keyboards/elephant42/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "elephant42",
-    "manufacturer": "illness072",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
-    "maintainer": "illness072",
-    "usb": {
-        "vid": "0x4649",
-        "pid": "0x0721",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "sat_steps": 8,
-        "val_steps": 8,
-        "speed_steps": 8,
-        "max_brightness": 170,
-        "split_count": [27, 27]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 54,
-        "max_brightness": 170,
-        "split_count": [27, 27],
-        "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
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2",
-        "transport": {
-            "sync": {
-                "matrix_state": true
-            }
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.6},
-                {"matrix": [0, 1], "x": 1, "y": 1.1},
-                {"matrix": [0, 2], "x": 2, "y": 0.3},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.6},
-                {"matrix": [0, 5], "x": 5, "y": 0.8},
-
-                {"matrix": [4, 5], "x": 10.5, "y": 0.8},
-                {"matrix": [4, 4], "x": 11.5, "y": 0.6},
-                {"matrix": [4, 3], "x": 12.5, "y": 0},
-                {"matrix": [4, 2], "x": 13.5, "y": 0.3},
-                {"matrix": [4, 1], "x": 14.5, "y": 1.1},
-                {"matrix": [4, 0], "x": 15.5, "y": 1.6},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.6},
-                {"matrix": [1, 1], "x": 1, "y": 2.1},
-                {"matrix": [1, 2], "x": 2, "y": 1.3},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.6},
-                {"matrix": [1, 5], "x": 5, "y": 1.8},
-
-                {"matrix": [5, 5], "x": 10.5, "y": 1.8},
-                {"matrix": [5, 4], "x": 11.5, "y": 1.6},
-                {"matrix": [5, 3], "x": 12.5, "y": 1},
-                {"matrix": [5, 2], "x": 13.5, "y": 1.3},
-                {"matrix": [5, 1], "x": 14.5, "y": 2.1},
-                {"matrix": [5, 0], "x": 15.5, "y": 2.6},
-
-                {"matrix": [2, 1], "x": 1, "y": 3.1},
-                {"matrix": [2, 2], "x": 2, "y": 2.3},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.6},
-                {"matrix": [2, 5], "x": 5, "y": 2.8},
-
-                {"matrix": [6, 5], "x": 10.5, "y": 2.8},
-                {"matrix": [6, 4], "x": 11.5, "y": 2.6},
-                {"matrix": [6, 3], "x": 12.5, "y": 2},
-                {"matrix": [6, 2], "x": 13.5, "y": 2.3},
-                {"matrix": [6, 1], "x": 14.5, "y": 3.1},
-
-                {"matrix": [3, 2], "x": 3.5, "y": 4},
-                {"matrix": [3, 3], "x": 4.5, "y": 4},
-                {"matrix": [3, 4], "x": 5.5, "y": 4},
-                {"matrix": [3, 5], "x": 6.5, "y": 4},
-
-                {"matrix": [7, 5], "x": 9.25, "y": 4},
-                {"matrix": [7, 4], "x": 10.25, "y": 4},
-                {"matrix": [7, 3], "x": 11.25, "y": 4},
-                {"matrix": [7, 2], "x": 12.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/elephant42/keyboard.json b/keyboards/elephant42/keyboard.json
new file mode 100644
index 00000000000..e71f1438130
--- /dev/null
+++ b/keyboards/elephant42/keyboard.json
@@ -0,0 +1,122 @@
+{
+    "keyboard_name": "elephant42",
+    "manufacturer": "illness072",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
+    "maintainer": "illness072",
+    "usb": {
+        "vid": "0x4649",
+        "pid": "0x0721",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "sat_steps": 8,
+        "val_steps": 8,
+        "speed_steps": 8,
+        "max_brightness": 170,
+        "split_count": [27, 27]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 54,
+        "max_brightness": 170,
+        "split_count": [27, 27],
+        "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
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.6},
+                {"matrix": [0, 1], "x": 1, "y": 1.1},
+                {"matrix": [0, 2], "x": 2, "y": 0.3},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.6},
+                {"matrix": [0, 5], "x": 5, "y": 0.8},
+
+                {"matrix": [4, 5], "x": 10.5, "y": 0.8},
+                {"matrix": [4, 4], "x": 11.5, "y": 0.6},
+                {"matrix": [4, 3], "x": 12.5, "y": 0},
+                {"matrix": [4, 2], "x": 13.5, "y": 0.3},
+                {"matrix": [4, 1], "x": 14.5, "y": 1.1},
+                {"matrix": [4, 0], "x": 15.5, "y": 1.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.6},
+                {"matrix": [1, 1], "x": 1, "y": 2.1},
+                {"matrix": [1, 2], "x": 2, "y": 1.3},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.6},
+                {"matrix": [1, 5], "x": 5, "y": 1.8},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 1.8},
+                {"matrix": [5, 4], "x": 11.5, "y": 1.6},
+                {"matrix": [5, 3], "x": 12.5, "y": 1},
+                {"matrix": [5, 2], "x": 13.5, "y": 1.3},
+                {"matrix": [5, 1], "x": 14.5, "y": 2.1},
+                {"matrix": [5, 0], "x": 15.5, "y": 2.6},
+
+                {"matrix": [2, 1], "x": 1, "y": 3.1},
+                {"matrix": [2, 2], "x": 2, "y": 2.3},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.6},
+                {"matrix": [2, 5], "x": 5, "y": 2.8},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 2.8},
+                {"matrix": [6, 4], "x": 11.5, "y": 2.6},
+                {"matrix": [6, 3], "x": 12.5, "y": 2},
+                {"matrix": [6, 2], "x": 13.5, "y": 2.3},
+                {"matrix": [6, 1], "x": 14.5, "y": 3.1},
+
+                {"matrix": [3, 2], "x": 3.5, "y": 4},
+                {"matrix": [3, 3], "x": 4.5, "y": 4},
+                {"matrix": [3, 4], "x": 5.5, "y": 4},
+                {"matrix": [3, 5], "x": 6.5, "y": 4},
+
+                {"matrix": [7, 5], "x": 9.25, "y": 4},
+                {"matrix": [7, 4], "x": 10.25, "y": 4},
+                {"matrix": [7, 3], "x": 11.25, "y": 4},
+                {"matrix": [7, 2], "x": 12.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk
deleted file mode 100644
index db121c92e35..00000000000
--- a/keyboards/elephant42/rules.mk
+++ /dev/null
@@ -1,16 +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
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json
deleted file mode 100644
index 74d06b52ad6..00000000000
--- a/keyboards/emery65/info.json
+++ /dev/null
@@ -1,337 +0,0 @@
-{
-    "keyboard_name": "Emery65",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4536",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
-        "rows": ["A2", "B9", "B8", "B5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
-    },
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/emery65/keyboard.json b/keyboards/emery65/keyboard.json
new file mode 100644
index 00000000000..c80bcf80425
--- /dev/null
+++ b/keyboards/emery65/keyboard.json
@@ -0,0 +1,343 @@
+{
+    "keyboard_name": "Emery65",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4536",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/emery65/rules.mk
+++ b/keyboards/emery65/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/era/linx3/n86/config.h b/keyboards/era/linx3/n86/config.h
new file mode 100644
index 00000000000..8b294dd91b1
--- /dev/null
+++ b/keyboards/era/linx3/n86/config.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/keyboard.json b/keyboards/era/linx3/n86/keyboard.json
new file mode 100644
index 00000000000..40e1f78baaa
--- /dev/null
+++ b/keyboards/era/linx3/n86/keyboard.json
@@ -0,0 +1,451 @@
+{
+    "manufacturer": "eerraa",
+    "keyboard_name": "N86",
+    "maintainer": "eerraa",
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"],
+        "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1},
+            {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4},
+            {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4},
+            {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4},
+            {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4},
+            {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4},
+            {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4},
+            {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4},
+            {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4},
+            {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4},
+            {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4},
+            {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4},
+            {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4},
+            {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4},
+            {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4},
+            {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4},
+            {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4},
+            {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1},
+            {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4},
+            {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4},
+            {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4},
+            {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4},
+            {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4},
+            {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4},
+            {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4},
+            {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4},
+            {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1},
+            {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1},
+            {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4},
+            {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1},
+            {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4},
+            {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4},
+            {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4},
+            {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4},
+            {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4},
+            {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1},
+            {"matrix": [5, 0], "x": 3, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 19, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 36, "y": 64, "flags": 1},
+            {"x": 62, "y": 64, "flags": 4},
+            {"x": 76, "y": 64, "flags": 4},
+            {"matrix": [5, 7], "x": 91, "y": 64, "flags": 4},
+            {"x": 106, "y": 64, "flags": 4},
+            {"x": 120, "y": 64, "flags": 4},
+            {"matrix": [5, 11], "x": 146, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 162, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 179, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1},
+            {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1},
+            {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1}
+        ],
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0008",
+        "vid": "0x4552"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP4"
+    },
+    "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/keymaps/default/keymap.c b/keyboards/era/linx3/n86/keymaps/default/keymap.c
new file mode 100644
index 00000000000..49ae04a5a79
--- /dev/null
+++ b/keyboards/era/linx3/n86/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/keymaps/via/keymap.c b/keyboards/era/linx3/n86/keymaps/via/keymap.c
new file mode 100644
index 00000000000..49ae04a5a79
--- /dev/null
+++ b/keyboards/era/linx3/n86/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/keymaps/via/rules.mk b/keyboards/era/linx3/n86/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/era/linx3/n86/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/linx3/n86/readme.md b/keyboards/era/linx3/n86/readme.md
new file mode 100644
index 00000000000..ba681090689
--- /dev/null
+++ b/keyboards/era/linx3/n86/readme.md
@@ -0,0 +1,23 @@
+# N86
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: Syryan & Linx3
+* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/linx3/n86:default
+
+Flashing example for this keyboard:
+
+    make era/linx3/n86:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/config.h b/keyboards/era/linx3/n8x/config.h
new file mode 100644
index 00000000000..b2cffb1151a
--- /dev/null
+++ b/keyboards/era/linx3/n8x/config.h
@@ -0,0 +1,14 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+/* Reset */
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U
+
+/* BACKLIGHT PWM */
+#define BACKLIGHT_PWM_DRIVER PWMD1
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/halconf.h b/keyboards/era/linx3/n8x/halconf.h
new file mode 100644
index 00000000000..3dbc886a838
--- /dev/null
+++ b/keyboards/era/linx3/n8x/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/keyboard.json b/keyboards/era/linx3/n8x/keyboard.json
new file mode 100644
index 00000000000..ae0d608ffa8
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keyboard.json
@@ -0,0 +1,1230 @@
+{
+    "manufacturer": "eerraa",
+    "keyboard_name": "N8X",
+    "maintainer": "eerraa",
+    "backlight": {
+        "breathing": true,
+        "breathing_period": 5,
+        "levels": 10,
+        "pin": "GP3"
+    },
+    "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP11",
+        "scroll_lock": "GP8"
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP1", "GP0", "GP2"],
+        "rows": ["GP4", "GP5", "GP6", "GP7", "GP10", "GP9"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0007",
+        "vid": "0x4552"
+    },
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+        "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/keymaps/default/keymap.c b/keyboards/era/linx3/n8x/keymaps/default/keymap.c
new file mode 100644
index 00000000000..3dd2571ab86
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/keymaps/via/keymap.c b/keyboards/era/linx3/n8x/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3dd2571ab86
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keymaps/via/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+    [0] = LAYOUT_all(
+        KC_ESC ,          KC_F1  , KC_F2  , KC_F3 , KC_F4   , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_SCRL, KC_PAUS,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4  , KC_5    , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R  , KC_T    , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL , KC_END , KC_PGDN,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F  , KC_G    , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C  , KC_V    , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        QK_BOOT,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/keymaps/via/rules.mk b/keyboards/era/linx3/n8x/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/era/linx3/n8x/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/mcuconf.h b/keyboards/era/linx3/n8x/mcuconf.h
new file mode 100644
index 00000000000..9a4b5b1c61e
--- /dev/null
+++ b/keyboards/era/linx3/n8x/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef RP_PWM_USE_PWM1
+#define RP_PWM_USE_PWM1 TRUE
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/readme.md b/keyboards/era/linx3/n8x/readme.md
new file mode 100644
index 00000000000..b414e149758
--- /dev/null
+++ b/keyboards/era/linx3/n8x/readme.md
@@ -0,0 +1,23 @@
+# N8X
+
+* Keyboard Maintainer: [ERA](https://github.com/eerraa)
+* Hardware supported: Syryan & Linx3
+* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make era/linx3/n8x:default
+
+Flashing example for this keyboard:
+
+    make era/linx3/n8x:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json
deleted file mode 100644
index dcbb1999ca9..00000000000
--- a/keyboards/ergodox_ez/glow/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "keyboard_name": "ErgoDox EZ Glow",
-    "usb": {
-        "pid": "0x4976"
-    }
-}
diff --git a/keyboards/ergodox_ez/glow/keyboard.json b/keyboards/ergodox_ez/glow/keyboard.json
new file mode 100644
index 00000000000..43f0ee0b490
--- /dev/null
+++ b/keyboards/ergodox_ez/glow/keyboard.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "ErgoDox EZ Glow",
+    "usb": {
+        "pid": "0x4976"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    }
+}
diff --git a/keyboards/ergodox_ez/glow/rules.mk b/keyboards/ergodox_ez/glow/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/ergodox_ez/glow/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 68f785f3cc0..187d9dd8e2e 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -3,20 +3,7 @@
 # details), include the following define:
 # OPT_DEFS += -DLEFT_LEDS
 
-# 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
 CUSTOM_MATRIX    = lite # Custom matrix file for the ErgoDox EZ
-NKRO_ENABLE      = yes           # Enable N-Key Rollover
-UNICODE_ENABLE   = no  # Unicode
-SWAP_HANDS_ENABLE= no   # Allow swapping hands of keyboard
-
-RGB_MATRIX_ENABLE = no # enable later
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json
deleted file mode 100644
index 181ac52e6ce..00000000000
--- a/keyboards/ergodox_ez/shine/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "keyboard_name": "ErgoDox EZ Shine",
-    "usb": {
-        "pid": "0x4975"
-    },
-    "rgblight": {
-        "driver": "custom"
-    }
-}
diff --git a/keyboards/ergodox_ez/shine/keyboard.json b/keyboards/ergodox_ez/shine/keyboard.json
new file mode 100644
index 00000000000..bc0f218d7ec
--- /dev/null
+++ b/keyboards/ergodox_ez/shine/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "ErgoDox EZ Shine",
+    "usb": {
+        "pid": "0x4975"
+    },
+    "rgblight": {
+        "driver": "custom"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgblight": true
+    }
+}
diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk
index 4ab494d1aae..827f58bd6ae 100644
--- a/keyboards/ergodox_ez/shine/rules.mk
+++ b/keyboards/ergodox_ez/shine/rules.mk
@@ -1,3 +1,2 @@
-RGBLIGHT_ENABLE = yes
 WS2812_DRIVER_REQUIRED = yes
 SRC += rgblight_custom.c
diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json
deleted file mode 100644
index 305adc9e125..00000000000
--- a/keyboards/ergodox_stm32/info.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-    "keyboard_name": "ErgoDox STM32",
-    "manufacturer": "ErgoDox",
-    "url": "github.com/codetector1374",
-    "maintainer": "codetector1374",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1308",
-        "device_version": "1.0.1"
-    },
-"layouts": {
-        "LAYOUT_ergodox": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [3, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [5, 5], "x": 6, "y": 5},
-                {"matrix": [6, 5], "x": 7, "y": 5},
-                {"matrix": [4, 5], "x": 7, "y": 6},
-
-                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
-                {"matrix": [1, 5], "x": 7, "y": 7},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [10, 0], "x": 12.5, "y": 0},
-                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [10, 1], "x": 12.5, "y": 1},
-                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [10, 2], "x": 12.5, "y": 2},
-                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [10, 3], "x": 12.5, "y": 3},
-                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 4], "x": 12.5, "y": 4},
-                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [7, 5], "x": 9, "y": 5},
-                {"matrix": [8, 5], "x": 10, "y": 5},
-
-                {"matrix": [9, 5], "x": 9, "y": 6},
-
-                {"matrix": [12, 5], "x": 9, "y": 7},
-
-                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
-                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
-            ]
-        },
-        "LAYOUT_ergodox_pretty": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
-                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
-                {"matrix": [3, 0], "x": 3.5, "y": 0},
-                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
-                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
-                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
-                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
-                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
-                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
-                {"matrix": [10, 0], "x": 12.5, "y": 0},
-                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
-                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
-                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
-                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
-                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
-                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
-                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
-                {"matrix": [10, 1], "x": 12.5, "y": 1},
-                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
-                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [3, 2], "x": 3.5, "y": 2},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
-                {"matrix": [10, 2], "x": 12.5, "y": 2},
-                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
-                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
-                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
-                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
-                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
-                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
-                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
-                {"matrix": [10, 3], "x": 12.5, "y": 3},
-                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
-                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
-                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
-                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
-                {"matrix": [3, 4], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
-                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
-                {"matrix": [10, 4], "x": 12.5, "y": 4},
-                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
-                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
-                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
-
-                {"matrix": [5, 5], "x": 6, "y": 5},
-                {"matrix": [6, 5], "x": 7, "y": 5},
-
-                {"matrix": [7, 5], "x": 9, "y": 5},
-                {"matrix": [8, 5], "x": 10, "y": 5},
-
-                {"matrix": [4, 5], "x": 7, "y": 6},
-
-                {"matrix": [9, 5], "x": 9, "y": 6},
-
-                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
-                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
-
-                {"matrix": [1, 5], "x": 7, "y": 7},
-
-                {"matrix": [12, 5], "x": 9, "y": 7},
-
-                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
-                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ergodox_stm32/keyboard.json b/keyboards/ergodox_stm32/keyboard.json
new file mode 100644
index 00000000000..9315a3971f5
--- /dev/null
+++ b/keyboards/ergodox_stm32/keyboard.json
@@ -0,0 +1,213 @@
+{
+    "keyboard_name": "ErgoDox STM32",
+    "manufacturer": "ErgoDox",
+    "url": "github.com/codetector1374",
+    "maintainer": "codetector1374",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1308",
+        "device_version": "1.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "unicode": true
+    },
+    "processor": "STM32F103",
+    "bootloader": "custom",
+    "layouts": {
+        "LAYOUT_ergodox": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
+            ]
+        },
+        "LAYOUT_ergodox_pretty": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+                {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+                {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+                {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+                {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+                {"matrix": [10, 0], "x": 12.5, "y": 0},
+                {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+                {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+                {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+                {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+                {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+                {"matrix": [10, 1], "x": 12.5, "y": 1},
+                {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+                {"matrix": [10, 2], "x": 12.5, "y": 2},
+                {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+                {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+                {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+                {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+                {"matrix": [10, 3], "x": 12.5, "y": 3},
+                {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+                {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+                {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+                {"matrix": [3, 4], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+                {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+                {"matrix": [10, 4], "x": 12.5, "y": 4},
+                {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+                {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+                {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+                {"matrix": [5, 5], "x": 6, "y": 5},
+                {"matrix": [6, 5], "x": 7, "y": 5},
+
+                {"matrix": [7, 5], "x": 9, "y": 5},
+                {"matrix": [8, 5], "x": 10, "y": 5},
+
+                {"matrix": [4, 5], "x": 7, "y": 6},
+
+                {"matrix": [9, 5], "x": 9, "y": 6},
+
+                {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+                {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+
+                {"matrix": [1, 5], "x": 7, "y": 7},
+
+                {"matrix": [12, 5], "x": 9, "y": 7},
+
+                {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+                {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 5481eef1a2e..a4e9df8c6a9 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -1,19 +1,8 @@
-# MCU name
-MCU = STM32F103
+# custom bootloader
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
-# Bootloader selection
-BOOTLOADER = custom
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-CUSTOM_MATRIX = yes # Custom matrix file
-UNICODE_ENABLE   = yes # Unicode
+CUSTOM_MATRIX = yes
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json
index 51c522043b3..ef40c1d960d 100644
--- a/keyboards/ergoslab/rev1/keyboard.json
+++ b/keyboards/ergoslab/rev1/keyboard.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "rgblight": {
@@ -24,6 +25,13 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "rgblight": true
+  },
   "layout_aliases": {
     "LAYOUT_ergoslab": "LAYOUT"
   },
diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk
index 503f274a9f3..8eb40c77d5a 100644
--- a/keyboards/ergoslab/rules.mk
+++ b/keyboards/ergoslab/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = ergoslab/rev1
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
deleted file mode 100644
index 77aecec0ed1..00000000000
--- a/keyboards/ergotravel/rev1/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "keyboard_name": "ErgoTravel Keyboard",
-  "manufacturer": "JPConstantineau.com",
-  "url": "https://github.com/jpconstantineau/ErgoTravel",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4A50",
-    "pid": "0x4554",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["C6", "D7", "E6", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "rgblight": {
-    "led_count": 12
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "bootloader": "caterina",
-  "processor": "atmega32u4",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.25},
-        {"matrix": [0, 2], "x": 2, "y": 0.125},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.125},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6, "y": 0.5},
-
-        {"matrix": [4, 6], "x": 9, "y": 0.5},
-        {"matrix": [4, 5], "x": 10, "y": 0.25},
-        {"matrix": [4, 4], "x": 11, "y": 0.125},
-        {"matrix": [4, 3], "x": 12, "y": 0},
-        {"matrix": [4, 2], "x": 13, "y": 0.125},
-        {"matrix": [4, 1], "x": 14, "y": 0.25},
-        {"matrix": [4, 0], "x": 15, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.25},
-        {"matrix": [1, 2], "x": 2, "y": 1.125},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.125},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-
-        {"matrix": [5, 6], "x": 9, "y": 1.5},
-        {"matrix": [5, 5], "x": 10, "y": 1.25},
-        {"matrix": [5, 4], "x": 11, "y": 1.125},
-        {"matrix": [5, 3], "x": 12, "y": 1},
-        {"matrix": [5, 2], "x": 13, "y": 1.125},
-        {"matrix": [5, 1], "x": 14, "y": 1.25},
-        {"matrix": [5, 0], "x": 15, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.25},
-        {"matrix": [2, 2], "x": 2, "y": 2.125},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.125},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-        {"matrix": [2, 6], "x": 6.5, "y": 3},
-
-        {"matrix": [6, 6], "x": 8.5, "y": 3},
-        {"matrix": [6, 5], "x": 10, "y": 2.25},
-        {"matrix": [6, 4], "x": 11, "y": 2.125},
-        {"matrix": [6, 3], "x": 12, "y": 2},
-        {"matrix": [6, 2], "x": 13, "y": 2.125},
-        {"matrix": [6, 1], "x": 14, "y": 2.25},
-        {"matrix": [6, 0], "x": 15, "y": 2.375},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375},
-        {"matrix": [3, 1], "x": 1, "y": 3.25},
-        {"matrix": [3, 2], "x": 2, "y": 3.125},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 5.5, "y": 4},
-        {"matrix": [3, 5], "x": 6.5, "y": 4},
-
-        {"matrix": [7, 5], "x": 8.5, "y": 4},
-        {"matrix": [7, 4], "x": 9.5, "y": 4},
-        {"matrix": [7, 3], "x": 12, "y": 3},
-        {"matrix": [7, 2], "x": 13, "y": 3.125},
-        {"matrix": [7, 1], "x": 14, "y": 3.25},
-        {"matrix": [7, 0], "x": 15, "y": 3.375}
-      ]
-    }
-  }
-}
diff --git a/keyboards/ergotravel/rev1/keyboard.json b/keyboards/ergotravel/rev1/keyboard.json
new file mode 100644
index 00000000000..14c645d2f0c
--- /dev/null
+++ b/keyboards/ergotravel/rev1/keyboard.json
@@ -0,0 +1,102 @@
+{
+  "keyboard_name": "ErgoTravel Keyboard",
+  "manufacturer": "JPConstantineau.com",
+  "url": "https://github.com/jpconstantineau/ErgoTravel",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4A50",
+    "pid": "0x4554",
+    "device_version": "1.0.0"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "rgblight": {
+    "led_count": 12
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "bootloader": "caterina",
+  "processor": "atmega32u4",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "command": true,
+    "rgblight": true
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+        {"matrix": [4, 6], "x": 9, "y": 0.5},
+        {"matrix": [4, 5], "x": 10, "y": 0.25},
+        {"matrix": [4, 4], "x": 11, "y": 0.125},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 2], "x": 13, "y": 0.125},
+        {"matrix": [4, 1], "x": 14, "y": 0.25},
+        {"matrix": [4, 0], "x": 15, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+        {"matrix": [5, 6], "x": 9, "y": 1.5},
+        {"matrix": [5, 5], "x": 10, "y": 1.25},
+        {"matrix": [5, 4], "x": 11, "y": 1.125},
+        {"matrix": [5, 3], "x": 12, "y": 1},
+        {"matrix": [5, 2], "x": 13, "y": 1.125},
+        {"matrix": [5, 1], "x": 14, "y": 1.25},
+        {"matrix": [5, 0], "x": 15, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 3},
+
+        {"matrix": [6, 6], "x": 8.5, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 2.25},
+        {"matrix": [6, 4], "x": 11, "y": 2.125},
+        {"matrix": [6, 3], "x": 12, "y": 2},
+        {"matrix": [6, 2], "x": 13, "y": 2.125},
+        {"matrix": [6, 1], "x": 14, "y": 2.25},
+        {"matrix": [6, 0], "x": 15, "y": 2.375},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375},
+        {"matrix": [3, 1], "x": 1, "y": 3.25},
+        {"matrix": [3, 2], "x": 2, "y": 3.125},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 5.5, "y": 4},
+        {"matrix": [3, 5], "x": 6.5, "y": 4},
+
+        {"matrix": [7, 5], "x": 8.5, "y": 4},
+        {"matrix": [7, 4], "x": 9.5, "y": 4},
+        {"matrix": [7, 3], "x": 12, "y": 3},
+        {"matrix": [7, 2], "x": 13, "y": 3.125},
+        {"matrix": [7, 1], "x": 14, "y": 3.25},
+        {"matrix": [7, 0], "x": 15, "y": 3.375}
+      ]
+    }
+  }
+}
diff --git a/keyboards/ergotravel/rev1/rules.mk b/keyboards/ergotravel/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/ergotravel/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk
index aab244a2179..3f30277bb56 100644
--- a/keyboards/ergotravel/rules.mk
+++ b/keyboards/ergotravel/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = ergotravel/rev1
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
deleted file mode 100644
index 055e8afe380..00000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Eric Lau
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json
deleted file mode 100644
index 36a39c1abe2..00000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
+++ /dev/null
@@ -1,401 +0,0 @@
-{
-    "keyboard_name": "NumDiscipline",
-    "manufacturer": "ELau",
-    "url": "https://github.com/ericrlau/NumDiscipline",
-    "maintainer": "ericrlau",
-    "usb": {
-        "vid": "0x454C",
-        "pid": "0x0001",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "matrix_pins": {
-        "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
-        "rows": ["B2", "A1", "B1", "A0", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "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, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_std_2_right_mods": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_wkl_2_right_mods": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_wkl_3_right_mods": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0},
-                {"matrix": [0, 16], "x": 17.5, "y": 0},
-                {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [1, 15], "x": 16.5, "y": 1},
-                {"matrix": [1, 16], "x": 17.5, "y": 1},
-                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [2, 15], "x": 16.5, "y": 2},
-                {"matrix": [2, 16], "x": 17.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-                {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [3, 15], "x": 16.5, "y": 3},
-                {"matrix": [3, 16], "x": 17.5, "y": 3},
-                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-
-                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-                {"matrix": [4, 15], "x": 16.5, "y": 4},
-                {"matrix": [4, 16], "x": 17.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ericrlau/numdiscipline/rev1/keyboard.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
new file mode 100644
index 00000000000..5e9f3937324
--- /dev/null
+++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
@@ -0,0 +1,412 @@
+{
+    "keyboard_name": "NumDiscipline",
+    "manufacturer": "ELau",
+    "url": "https://github.com/ericrlau/NumDiscipline",
+    "maintainer": "ericrlau",
+    "usb": {
+        "vid": "0x454C",
+        "pid": "0x0001",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "matrix_pins": {
+        "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
+        "rows": ["B2", "A1", "B1", "A0", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "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, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_std_2_right_mods": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_wkl_2_right_mods": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_wkl_3_right_mods": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2},
+                {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 3},
+                {"matrix": [3, 15], "x": 16.5, "y": 3},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+
+                {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4},
+                {"matrix": [4, 16], "x": 17.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
index 18550f0a64d..c2ee0bc86f9 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk
+++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
deleted file mode 100644
index 8c5720d0c48..00000000000
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Atom47 rev2",
-    "manufacturer": "Evyd13",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0x8E66",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"],
-        "rows": ["B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 4,
-        "breathing": true
-    },
-    "rgblight": {
-        "led_count": 1
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B7",
-        "esc_output": "D7",
-        "led": "B6"
-    },
-    "indicators": {
-        "caps_lock": "F5"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space"
-    },
-    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, 12], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/atom47/rev2/keyboard.json b/keyboards/evyd13/atom47/rev2/keyboard.json
new file mode 100644
index 00000000000..62927b70a36
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev2/keyboard.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "Atom47 rev2",
+    "manufacturer": "Evyd13",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x8E66",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"],
+        "rows": ["B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 4,
+        "breathing": true
+    },
+    "rgblight": {
+        "led_count": 1
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B7",
+        "esc_output": "D7",
+        "led": "B6"
+    },
+    "indicators": {
+        "caps_lock": "F5"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
+    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/atom47/rev2/rules.mk b/keyboards/evyd13/atom47/rev2/rules.mk
deleted file mode 100644
index 104711e4206..00000000000
--- a/keyboards/evyd13/atom47/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build Options
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
deleted file mode 100644
index fc4046d3fc3..00000000000
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "keyboard_name": "Atom47 rev3",
-    "manufacturer": "Evyd13",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0x0E6D",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"],
-        "rows": ["B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5,
-        "breathing": true
-    },
-    "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": "F5"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B0",
-        "esc_output": "B7",
-        "led": "E6"
-    },
-    "indicators": {
-        "caps_lock": "E6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space"
-    },
-    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 12], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
-            ]
-        },
-        "LAYOUT_full_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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/atom47/rev3/keyboard.json b/keyboards/evyd13/atom47/rev3/keyboard.json
new file mode 100644
index 00000000000..009c3ef5345
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev3/keyboard.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "Atom47 rev3",
+    "manufacturer": "Evyd13",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x0E6D",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"],
+        "rows": ["B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5,
+        "breathing": true
+    },
+    "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": "F5"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B0",
+        "esc_output": "B7",
+        "led": "E6"
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "backlight": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
+    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_full_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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/atom47/rev3/rules.mk b/keyboards/evyd13/atom47/rev3/rules.mk
deleted file mode 100644
index 54a2685bf63..00000000000
--- a/keyboards/evyd13/atom47/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
deleted file mode 100644
index b2b4bf9ef23..00000000000
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "keyboard_name": "Atom47 rev4",
-    "manufacturer": "Evyd13",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0x8446",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"],
-        "rows": ["D0", "C2", "C5", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "B4"}
-        ]
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "C6",
-        "esc_output": "C4",
-        "led": "D1"
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "on_state": 0
-    },
-    "processor": "atmega32u2",
-    "bootloader": "qmk-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space"
-    },
-    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 12], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
-            ]
-        },
-        "LAYOUT_full_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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/atom47/rev4/keyboard.json b/keyboards/evyd13/atom47/rev4/keyboard.json
new file mode 100644
index 00000000000..cea416e1a68
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev4/keyboard.json
@@ -0,0 +1,149 @@
+{
+    "keyboard_name": "Atom47 rev4",
+    "manufacturer": "Evyd13",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x8446",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"],
+        "rows": ["D0", "C2", "C5", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B4"}
+        ]
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "C6",
+        "esc_output": "C4",
+        "led": "D1"
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "on_state": 0
+    },
+    "processor": "atmega32u2",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "encoder": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
+    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_full_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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/atom47/rev4/rules.mk b/keyboards/evyd13/atom47/rev4/rules.mk
deleted file mode 100644
index 1eb7c8bd08b..00000000000
--- a/keyboards/evyd13/atom47/rev4/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-ENCODER_ENABLE = yes
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
deleted file mode 100644
index e82a7797dee..00000000000
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "Atom47 rev5",
-    "manufacturer": "Evyd13",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0x92EA",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true
-        },
-        "driver": "is31fl3733"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
-        "rows": ["B1", "B2", "B3", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_split_space"
-    },
-    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
-
-                {"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, "w": 1.25},
-                {"matrix": [2, 12], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 8.75, "y": 3},
-                {"matrix": [3, 10], "x": 9.75, "y": 3},
-                {"matrix": [3, 11], "x": 10.75, "y": 3},
-                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/atom47/rev5/keyboard.json b/keyboards/evyd13/atom47/rev5/keyboard.json
new file mode 100644
index 00000000000..c002dcb18c0
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev5/keyboard.json
@@ -0,0 +1,117 @@
+{
+    "keyboard_name": "Atom47 rev5",
+    "manufacturer": "Evyd13",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x92EA",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true
+        },
+        "driver": "is31fl3733"
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
+        "rows": ["B1", "B2", "B3", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
+    "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": [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, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/evyd13/atom47/rev5/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk
index ab8264de7c2..9d5b7530777 100644
--- a/keyboards/evyd13/atom47/rules.mk
+++ b/keyboards/evyd13/atom47/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = evyd13/atom47/rev4
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
deleted file mode 100644
index 230ff5e311e..00000000000
--- a/keyboards/evyd13/eon40/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json
deleted file mode 100644
index ce989e1d2a5..00000000000
--- a/keyboards/evyd13/eon40/info.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "keyboard_name": "Eon40",
-  "manufacturer": "Evyd13",
-  "url": "https://maartenwut.com/product/eon40/",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x4705",
-    "pid": "0x0140",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
-    "rows": ["B7", "D5", "F5", "F6"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "E6", "pin_b": "F7"},
-      {"pin_a": "B0", "pin_b": "D0"},
-      {"pin_a": "D1", "pin_b": "D2"}
-    ]
-  },
-  "qmk_lufa_bootloader": {
-    "esc_input": "B7",
-    "esc_output": "F0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "qmk-dfu",
-  "community_layouts": ["ortho_4x12", "planck_mit"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_planck_mit": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    },
-    "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-        {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/evyd13/eon40/keyboard.json b/keyboards/evyd13/eon40/keyboard.json
new file mode 100644
index 00000000000..e957b109ff2
--- /dev/null
+++ b/keyboards/evyd13/eon40/keyboard.json
@@ -0,0 +1,208 @@
+{
+  "keyboard_name": "Eon40",
+  "manufacturer": "Evyd13",
+  "url": "https://maartenwut.com/product/eon40/",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4705",
+    "pid": "0x0140",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+    "rows": ["B7", "D5", "F5", "F6"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "E6", "pin_b": "F7"},
+      {"pin_a": "B0", "pin_b": "D0"},
+      {"pin_a": "D1", "pin_b": "D2"}
+    ]
+  },
+  "qmk_lufa_bootloader": {
+    "esc_input": "B7",
+    "esc_output": "F0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": false,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "encoder": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "community_layouts": ["ortho_4x12", "planck_mit"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_planck_mit": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    },
+    "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk
index ece680a57a3..16051206467 100644
--- a/keyboards/evyd13/eon40/rules.mk
+++ b/keyboards/evyd13/eon40/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
deleted file mode 100644
index f64827d05f1..00000000000
--- a/keyboards/evyd13/nt660/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json
deleted file mode 100644
index c222aba7005..00000000000
--- a/keyboards/evyd13/nt660/info.json
+++ /dev/null
@@ -1,260 +0,0 @@
-{
-    "keyboard_name": "nt660",
-    "manufacturer": "Evyd13",
-    "url": "",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0x1F02",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"],
-        "rows": ["B7", "E6", "F6", "F7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "B7",
-        "esc_output": "D6",
-        "led": "D0"
-    },
-    "indicators": {
-        "caps_lock": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["66_ansi", "66_iso"],
-    "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, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4},
-                {"matrix": [4, 13], "x": 14.5, "y": 4},
-                {"matrix": [4, 14], "x": 15.5, "y": 4}
-            ]
-        },
-        "LAYOUT_66_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4},
-                {"matrix": [4, 13], "x": 14.5, "y": 4},
-                {"matrix": [4, 14], "x": 15.5, "y": 4}
-            ]
-        },
-        "LAYOUT_66_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [1, 14], "x": 15.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},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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": 2.25},
-                {"matrix": [3, 13], "x": 14.5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13.5, "y": 4},
-                {"matrix": [4, 13], "x": 14.5, "y": 4},
-                {"matrix": [4, 14], "x": 15.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/nt660/keyboard.json b/keyboards/evyd13/nt660/keyboard.json
new file mode 100644
index 00000000000..142e9f2920d
--- /dev/null
+++ b/keyboards/evyd13/nt660/keyboard.json
@@ -0,0 +1,271 @@
+{
+    "keyboard_name": "nt660",
+    "manufacturer": "Evyd13",
+    "url": "",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0x1F02",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"],
+        "rows": ["B7", "E6", "F6", "F7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "B7",
+        "esc_output": "D6",
+        "led": "D0"
+    },
+    "indicators": {
+        "caps_lock": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "community_layouts": ["66_ansi", "66_iso"],
+    "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, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
+            ]
+        },
+        "LAYOUT_66_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.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},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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": 2.25},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4},
+                {"matrix": [4, 13], "x": 14.5, "y": 4},
+                {"matrix": [4, 14], "x": 15.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/nt660/rules.mk b/keyboards/evyd13/nt660/rules.mk
index f8c29ddc982..16051206467 100644
--- a/keyboards/evyd13/nt660/rules.mk
+++ b/keyboards/evyd13/nt660/rules.mk
@@ -1,16 +1,3 @@
-# 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
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
deleted file mode 100644
index 230ff5e311e..00000000000
--- a/keyboards/evyd13/pockettype/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json
deleted file mode 100644
index eda670af118..00000000000
--- a/keyboards/evyd13/pockettype/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "keyboard_name": "PocketType",
-  "manufacturer": "Evyd13",
-  "url": "https://mechboards.co.uk/shop/kits/pockettype/",
-  "maintainer": "evyd13",
-  "usb": {
-    "vid": "0x4705",
-    "pid": "0xFA7D",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"],
-    "rows": ["D3", "D1", "D7", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "community_layouts": ["ortho_4x12"],
-  "layouts": {
-    "LAYOUT_ortho_4x12": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-        {"matrix": [2, 6], "x": 6, "y": 2},
-        {"matrix": [2, 7], "x": 7, "y": 2},
-        {"matrix": [2, 8], "x": 8, "y": 2},
-        {"matrix": [2, 9], "x": 9, "y": 2},
-        {"matrix": [2, 10], "x": 10, "y": 2},
-        {"matrix": [2, 11], "x": 11, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 3},
-        {"matrix": [3, 7], "x": 7, "y": 3},
-        {"matrix": [3, 8], "x": 8, "y": 3},
-        {"matrix": [3, 9], "x": 9, "y": 3},
-        {"matrix": [3, 10], "x": 10, "y": 3},
-        {"matrix": [3, 11], "x": 11, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/evyd13/pockettype/keyboard.json b/keyboards/evyd13/pockettype/keyboard.json
new file mode 100644
index 00000000000..358e89020a6
--- /dev/null
+++ b/keyboards/evyd13/pockettype/keyboard.json
@@ -0,0 +1,87 @@
+{
+  "keyboard_name": "PocketType",
+  "manufacturer": "Evyd13",
+  "url": "https://mechboards.co.uk/shop/kits/pockettype/",
+  "maintainer": "evyd13",
+  "usb": {
+    "vid": "0x4705",
+    "pid": "0xFA7D",
+    "device_version": "0.0.1"
+  },
+  "matrix_pins": {
+    "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"],
+    "rows": ["D3", "D1", "D7", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": true,
+    "mousekey": false,
+    "extrakey": true
+  },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
+  "community_layouts": ["ortho_4x12"],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/evyd13/pockettype/rules.mk b/keyboards/evyd13/pockettype/rules.mk
index f8c29ddc982..16051206467 100644
--- a/keyboards/evyd13/pockettype/rules.mk
+++ b/keyboards/evyd13/pockettype/rules.mk
@@ -1,16 +1,3 @@
-# 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
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/keyboard.json
similarity index 100%
rename from keyboards/evyd13/wasdat/info.json
rename to keyboards/evyd13/wasdat/keyboard.json
diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c
index 60a1ea235a8..ae4bb6cb3a3 100644
--- a/keyboards/evyd13/wasdat/matrix.c
+++ b/keyboards/evyd13/wasdat/matrix.c
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 #include "sn74x138.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
deleted file mode 100644
index 9fb14283ae9..00000000000
--- a/keyboards/evyd13/wasdat_code/info.json
+++ /dev/null
@@ -1,503 +0,0 @@
-{
-    "keyboard_name": "Wasdat Code",
-    "manufacturer": "Evyd13",
-    "url": "https://maartenwut.com/product/wasdat-code/",
-    "maintainer": "evyd13",
-    "usb": {
-        "vid": "0x4705",
-        "pid": "0xB00E",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "levels": 5,
-        "breathing": true
-    },
-    "dynamic_keymap": {
-        "layer_count": 3
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "F0",
-        "esc_output": "E6",
-        "led": "B1"
-    },
-    "indicators": {
-        "caps_lock": "B1",
-        "num_lock": "B3",
-        "scroll_lock": "B2",
-        "on_state": 0
-    },
-    "bootmagic": {
-        "matrix": [2, 3]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_fullsize_iso"
-    },
-    "layouts": {
-        "LAYOUT_fullsize_ansi": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-
-                {"matrix": [6, 4], "x": 2, "y": 0},
-                {"matrix": [6, 2], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [3, 1], "x": 6.5, "y": 0},
-                {"matrix": [0, 12], "x": 7.5, "y": 0},
-                {"matrix": [2, 15], "x": 8.5, "y": 0},
-                {"matrix": [6, 15], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 11], "x": 11, "y": 0},
-                {"matrix": [3, 11], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [5, 11], "x": 14, "y": 0},
-
-                {"matrix": [3, 3], "x": 15.25, "y": 0},
-                {"matrix": [4, 3], "x": 16.25, "y": 0},
-                {"matrix": [4, 1], "x": 17.25, "y": 0},
-
-                {"matrix": [6, 5], "x": 0, "y": 1.5},
-                {"matrix": [3, 5], "x": 1, "y": 1.5},
-                {"matrix": [3, 4], "x": 2, "y": 1.5},
-                {"matrix": [3, 2], "x": 3, "y": 1.5},
-                {"matrix": [3, 0], "x": 4, "y": 1.5},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-                {"matrix": [6, 10], "x": 6, "y": 1.5},
-                {"matrix": [3, 10], "x": 7, "y": 1.5},
-                {"matrix": [3, 12], "x": 8, "y": 1.5},
-                {"matrix": [3, 15], "x": 9, "y": 1.5},
-                {"matrix": [3, 13], "x": 10, "y": 1.5},
-                {"matrix": [6, 13], "x": 11, "y": 1.5},
-                {"matrix": [6, 12], "x": 12, "y": 1.5},
-                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
-                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
-                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
-                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
-                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
-                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
-                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
-                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
-                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
-                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
-                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
-
-                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
-                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
-                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
-                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
-                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
-                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
-                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
-                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
-                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
-                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
-                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
-                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT_fullsize_iso": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-
-                {"matrix": [6, 4], "x": 2, "y": 0},
-                {"matrix": [6, 2], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [3, 1], "x": 6.5, "y": 0},
-                {"matrix": [0, 12], "x": 7.5, "y": 0},
-                {"matrix": [2, 15], "x": 8.5, "y": 0},
-                {"matrix": [6, 15], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 11], "x": 11, "y": 0},
-                {"matrix": [3, 11], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [5, 11], "x": 14, "y": 0},
-
-                {"matrix": [3, 3], "x": 15.25, "y": 0},
-                {"matrix": [4, 3], "x": 16.25, "y": 0},
-                {"matrix": [4, 1], "x": 17.25, "y": 0},
-
-                {"matrix": [6, 5], "x": 0, "y": 1.5},
-                {"matrix": [3, 5], "x": 1, "y": 1.5},
-                {"matrix": [3, 4], "x": 2, "y": 1.5},
-                {"matrix": [3, 2], "x": 3, "y": 1.5},
-                {"matrix": [3, 0], "x": 4, "y": 1.5},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-                {"matrix": [6, 10], "x": 6, "y": 1.5},
-                {"matrix": [3, 10], "x": 7, "y": 1.5},
-                {"matrix": [3, 12], "x": 8, "y": 1.5},
-                {"matrix": [3, 15], "x": 9, "y": 1.5},
-                {"matrix": [3, 13], "x": 10, "y": 1.5},
-                {"matrix": [6, 13], "x": 11, "y": 1.5},
-                {"matrix": [6, 12], "x": 12, "y": 1.5},
-                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
-                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
-                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
-                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
-                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
-                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
-                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
-                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
-                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
-                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
-                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
-                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
-                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
-
-                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
-                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
-                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
-                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
-                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
-                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
-                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
-                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
-                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
-                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
-                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
-                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-
-                {"matrix": [6, 4], "x": 2, "y": 0},
-                {"matrix": [6, 2], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [3, 1], "x": 6.5, "y": 0},
-                {"matrix": [0, 12], "x": 7.5, "y": 0},
-                {"matrix": [2, 15], "x": 8.5, "y": 0},
-                {"matrix": [6, 15], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 11], "x": 11, "y": 0},
-                {"matrix": [3, 11], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [5, 11], "x": 14, "y": 0},
-
-                {"matrix": [3, 3], "x": 15.25, "y": 0},
-                {"matrix": [4, 3], "x": 16.25, "y": 0},
-                {"matrix": [4, 1], "x": 17.25, "y": 0},
-
-                {"matrix": [6, 5], "x": 0, "y": 1.5},
-                {"matrix": [3, 5], "x": 1, "y": 1.5},
-                {"matrix": [3, 4], "x": 2, "y": 1.5},
-                {"matrix": [3, 2], "x": 3, "y": 1.5},
-                {"matrix": [3, 0], "x": 4, "y": 1.5},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-                {"matrix": [6, 10], "x": 6, "y": 1.5},
-                {"matrix": [3, 10], "x": 7, "y": 1.5},
-                {"matrix": [3, 12], "x": 8, "y": 1.5},
-                {"matrix": [3, 15], "x": 9, "y": 1.5},
-                {"matrix": [3, 13], "x": 10, "y": 1.5},
-                {"matrix": [6, 13], "x": 11, "y": 1.5},
-                {"matrix": [6, 12], "x": 12, "y": 1.5},
-                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
-                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
-                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
-                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
-                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
-                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
-                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
-                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
-                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
-                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
-                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
-                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
-                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
-                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
-                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-
-                {"matrix": [6, 4], "x": 2, "y": 0},
-                {"matrix": [6, 2], "x": 3, "y": 0},
-                {"matrix": [2, 2], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-
-                {"matrix": [3, 1], "x": 6.5, "y": 0},
-                {"matrix": [0, 12], "x": 7.5, "y": 0},
-                {"matrix": [2, 15], "x": 8.5, "y": 0},
-                {"matrix": [6, 15], "x": 9.5, "y": 0},
-
-                {"matrix": [6, 11], "x": 11, "y": 0},
-                {"matrix": [3, 11], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [5, 11], "x": 14, "y": 0},
-
-                {"matrix": [3, 3], "x": 15.25, "y": 0},
-                {"matrix": [4, 3], "x": 16.25, "y": 0},
-                {"matrix": [4, 1], "x": 17.25, "y": 0},
-
-                {"matrix": [6, 5], "x": 0, "y": 1.5},
-                {"matrix": [3, 5], "x": 1, "y": 1.5},
-                {"matrix": [3, 4], "x": 2, "y": 1.5},
-                {"matrix": [3, 2], "x": 3, "y": 1.5},
-                {"matrix": [3, 0], "x": 4, "y": 1.5},
-                {"matrix": [6, 0], "x": 5, "y": 1.5},
-                {"matrix": [6, 10], "x": 6, "y": 1.5},
-                {"matrix": [3, 10], "x": 7, "y": 1.5},
-                {"matrix": [3, 12], "x": 8, "y": 1.5},
-                {"matrix": [3, 15], "x": 9, "y": 1.5},
-                {"matrix": [3, 13], "x": 10, "y": 1.5},
-                {"matrix": [6, 13], "x": 11, "y": 1.5},
-                {"matrix": [6, 12], "x": 12, "y": 1.5},
-                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
-                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
-                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
-                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
-                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
-                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
-                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
-                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
-                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
-                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
-                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
-                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
-                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
-                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
-                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
-                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
-                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
-                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
-                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
-                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
-                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
-                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/evyd13/wasdat_code/keyboard.json b/keyboards/evyd13/wasdat_code/keyboard.json
new file mode 100644
index 00000000000..8c1bb52b6bf
--- /dev/null
+++ b/keyboards/evyd13/wasdat_code/keyboard.json
@@ -0,0 +1,510 @@
+{
+    "keyboard_name": "Wasdat Code",
+    "manufacturer": "Evyd13",
+    "url": "https://maartenwut.com/product/wasdat-code/",
+    "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x4705",
+        "pid": "0xB00E",
+        "device_version": "0.0.1"
+    },
+    "backlight": {
+        "pin": "B7",
+        "levels": 5,
+        "breathing": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "F0",
+        "esc_output": "E6",
+        "led": "B1"
+    },
+    "indicators": {
+        "caps_lock": "B1",
+        "num_lock": "B3",
+        "scroll_lock": "B2",
+        "on_state": 0
+    },
+    "bootmagic": {
+        "matrix": [2, 3]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_fullsize_iso"
+    },
+    "layouts": {
+        "LAYOUT_fullsize_ansi": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
+
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/evyd13/wasdat_code/matrix.c b/keyboards/evyd13/wasdat_code/matrix.c
index f30ea3355a1..d392a31d7c7 100644
--- a/keyboards/evyd13/wasdat_code/matrix.c
+++ b/keyboards/evyd13/wasdat_code/matrix.c
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 #include "sn74x138.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk
index 00967d18474..6beea3e392f 100644
--- a/keyboards/evyd13/wasdat_code/rules.mk
+++ b/keyboards/evyd13/wasdat_code/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 VPATH += drivers/gpio
 SRC += matrix.c sn74x138.c
diff --git a/keyboards/exclusive/e85/hotswap/keyboard.json b/keyboards/exclusive/e85/hotswap/keyboard.json
index 779a717ec55..c64509496aa 100644
--- a/keyboards/exclusive/e85/hotswap/keyboard.json
+++ b/keyboards/exclusive/e85/hotswap/keyboard.json
@@ -41,6 +41,17 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT_ansi_standard": {
             "layout": [
diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk
index 4251159d944..8eef46d0ab4 100644
--- a/keyboards/exclusive/e85/rules.mk
+++ b/keyboards/exclusive/e85/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 DEFAULT_FOLDER = exclusive/e85/hotswap
diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json
index d34440389a6..5f7458e851b 100644
--- a/keyboards/exclusive/e85/soldered/keyboard.json
+++ b/keyboards/exclusive/e85/soldered/keyboard.json
@@ -41,6 +41,17 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_32/info.json
rename to keyboards/ez_maker/directpins/teensy_32/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_lc/info.json
rename to keyboards/ez_maker/directpins/teensy_lc/keyboard.json
diff --git a/keyboards/fallacy/indicators.h b/keyboards/fallacy/indicators.h
index 6de374cda8e..838a698f7b2 100755
--- a/keyboards/fallacy/indicators.h
+++ b/keyboards/fallacy/indicators.h
@@ -15,8 +15,7 @@
  */
 #pragma once
 
-#include "quantum.h"
-
+#include <stdbool.h>
 
 void init_fallacy_leds(void);
 void update_fallacy_leds(void);
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index 9489463a4cd..fbeca239d9f 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -32,6 +32,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["alice", "alice_split_bs"],
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs",
diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk
index ee1a36c9108..4b016ac9ad5 100755
--- a/keyboards/fallacy/rules.mk
+++ b/keyboards/fallacy/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 # project specific files
 SRC += indicators.c \
        drivers/led/issi/is31fl3731-mono.c
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index e65ed35dae7..6c573fef88b 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -17,6 +17,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true
+    },
     "debounce": 0,
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk
index 03a674d668c..46c4fa1efe4 100644
--- a/keyboards/fc660c/rules.mk
+++ b/keyboards/fc660c/rules.mk
@@ -1,13 +1,3 @@
-# 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 = yes           # Enable N-Key Rollover
-
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
 
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
index 5060885c695..9944dd3899d 100644
--- a/keyboards/fc980c/info.json
+++ b/keyboards/fc980c/info.json
@@ -18,6 +18,14 @@
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true,
+    "console": true,
+    "command": true,
+    "nkro": true
+  },
   "debounce": 0,
   "layouts": {
     "LAYOUT": {
diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk
index 03a674d668c..46c4fa1efe4 100644
--- a/keyboards/fc980c/rules.mk
+++ b/keyboards/fc980c/rules.mk
@@ -1,13 +1,3 @@
-# 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 = yes           # Enable N-Key Rollover
-
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
 
diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/info.json
deleted file mode 100644
index 3a06f9c0660..00000000000
--- a/keyboards/fearherbs1/blue_team_pad/info.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "keyboard_name": "blue_team_pad",
-    "maintainer": "fearherbs1",
-    "manufacturer": "fearherbs1",
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "url": "https://github.com/fearherbs1/blue-team-pad",
-    "usb": {
-        "vid": "0x4648",
-        "pid": "0x4254",
-        "device_version": "1.1.0"
-   },
-    "features": {
-        "encoder": true,
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": true,
-        "command": false,
-        "nkro": true
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["GP24", "GP23", "GP21", "GP20", "GP3"],
-        "rows": ["GP2", "GP11", "GP10", "GP9", "GP8"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP25", "pin_b": "GP28", "resolution": 2},
-            {"pin_a": "GP1", "pin_b": "GP0", "resolution": 2}
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 2},
-                {"matrix": [1, 3], "x": 3, "y": 2},
-                {"matrix": [1, 4], "x": 4, "y": 2},
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-                {"matrix": [2, 2], "x": 2, "y": 3},
-                {"matrix": [2, 3], "x": 3, "y": 3},
-                {"matrix": [2, 4], "x": 4, "y": 3},
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 4},
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 0], "x": 0, "y": 5},
-                {"matrix": [4, 1], "x": 1, "y": 5},
-                {"matrix": [4, 2], "x": 2, "y": 5},
-                {"matrix": [4, 3], "x": 3, "y": 5},
-                {"matrix": [4, 4], "x": 4, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fearherbs1/blue_team_pad/keyboard.json b/keyboards/fearherbs1/blue_team_pad/keyboard.json
new file mode 100644
index 00000000000..b47b049b45e
--- /dev/null
+++ b/keyboards/fearherbs1/blue_team_pad/keyboard.json
@@ -0,0 +1,62 @@
+{
+    "keyboard_name": "blue_team_pad",
+    "maintainer": "fearherbs1",
+    "manufacturer": "fearherbs1",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "url": "https://github.com/fearherbs1/blue-team-pad",
+    "usb": {
+        "vid": "0x4648",
+        "pid": "0x4254",
+        "device_version": "1.1.0"
+   },
+    "features": {
+        "encoder": true,
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": false,
+        "nkro": true,
+        "oled": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP24", "GP23", "GP21", "GP20", "GP3"],
+        "rows": ["GP2", "GP11", "GP10", "GP9", "GP8"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP25", "pin_b": "GP28", "resolution": 2},
+            {"pin_a": "GP1", "pin_b": "GP0", "resolution": 2}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
+                {"matrix": [2, 4], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 5},
+                {"matrix": [4, 4], "x": 4, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/fearherbs1/blue_team_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/feker/ik75/keymaps/default/keymap.c b/keyboards/feker/ik75/keymaps/default/keymap.c
index f6ca00552ec..0ba5c774db0 100644
--- a/keyboards/feker/ik75/keymaps/default/keymap.c
+++ b/keyboards/feker/ik75/keymaps/default/keymap.c
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
                 _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
                 _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
-                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
+                _______, GU_TOGG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
             ),
 };
 
diff --git a/keyboards/feker/ik75/keymaps/via/keymap.c b/keyboards/feker/ik75/keymaps/via/keymap.c
index e9a221cb3f9..71c82c2e2d7 100644
--- a/keyboards/feker/ik75/keymaps/via/keymap.c
+++ b/keyboards/feker/ik75/keymaps/via/keymap.c
@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI,
                 _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
                 _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD,
-                _______, GUI_TOG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
+                _______, GU_TOGG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______
             ),
 
 /*
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
index 5a65369f61c..a7f7c08bec1 100644
--- a/keyboards/ferris/0_1/info.json
+++ b/keyboards/ferris/0_1/info.json
@@ -4,10 +4,20 @@
     "usb": {
         "vid": "0xC2AB",
         "pid": "0x0000",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "no_startup_check": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "unicode": true
+    },
+    "build": {
+        "lto": true
+    },
     "community_layouts": ["split_3x5_2"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x5_2"
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index f971aa9a48b..c04c3c92ed3 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -1,19 +1,4 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = yes
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 06a826450b4..22ef500d6da 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -50,5 +50,8 @@
             "solid_multisplash": true
         },
         "driver": "is31fl3731"
+    },
+    "features": {
+        "rgb_matrix": true
     }
 }
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
index aad92997d0f..e69de29bb2d 100644
--- a/keyboards/ferris/0_2/bling/rules.mk
+++ b/keyboards/ferris/0_2/bling/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
index c6584ecf01a..d1108b51c49 100644
--- a/keyboards/ferris/0_2/info.json
+++ b/keyboards/ferris/0_2/info.json
@@ -2,10 +2,17 @@
     "manufacturer": "Cuddly Keyboards Ltd.",
     "usb": {
         "vid": "0xC2AB",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "no_startup_check": true
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "unicode": true
+    },
     "community_layouts": ["split_3x5_2"],
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x5_2"
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 6f67e3dece3..11b9d33a699 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -1,19 +1,4 @@
-# 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
-UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
 
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 8244960e45a..220cf28831f 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -33,6 +33,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_75_all": {
             "layout": [
diff --git a/keyboards/fjlabs/7vhotswap/rules.mk b/keyboards/fjlabs/7vhotswap/rules.mk
index 8bb5a64bff4..3437a35bdf1 100644
--- a/keyboards/fjlabs/7vhotswap/rules.mk
+++ b/keyboards/fjlabs/7vhotswap/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json
index 041d8a1d2fe..19adad79325 100644
--- a/keyboards/fjlabs/ad65/info.json
+++ b/keyboards/fjlabs/ad65/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": [
         "65_ansi_blocker",
         "65_ansi_blocker_split_bs",
diff --git a/keyboards/fjlabs/ad65/rules.mk b/keyboards/fjlabs/ad65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/ad65/rules.mk
+++ b/keyboards/fjlabs/ad65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 77b5fbe9566..2407c3ec26b 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -41,6 +41,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/avalon/rules.mk
+++ b/keyboards/fjlabs/avalon/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 5e0d9d5fb9b..5be09bfe0d0 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -36,6 +36,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/bks65/rules.mk b/keyboards/fjlabs/bks65/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/bks65/rules.mk
+++ b/keyboards/fjlabs/bks65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index dae926d08c9..609dc4cdbc0 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -33,6 +33,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/fjlabs/bks65solder/rules.mk b/keyboards/fjlabs/bks65solder/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/bks65solder/rules.mk
+++ b/keyboards/fjlabs/bks65solder/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json
index 2f53b237d24..9deb09fef29 100644
--- a/keyboards/fjlabs/bolsa65/info.json
+++ b/keyboards/fjlabs/bolsa65/info.json
@@ -15,6 +15,13 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": ["65_ansi_blocker"],
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/fjlabs/bolsa65/rules.mk b/keyboards/fjlabs/bolsa65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/bolsa65/rules.mk
+++ b/keyboards/fjlabs/bolsa65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index cd2f6a7ac2f..e4f48acc8ec 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -38,6 +38,14 @@
     },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_tkl_all": {
             "layout": [
diff --git a/keyboards/fjlabs/kf87/rules.mk b/keyboards/fjlabs/kf87/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/kf87/rules.mk
+++ b/keyboards/fjlabs/kf87/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index ed02d7d3b42..a16e2835cf2 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -37,6 +37,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker_badge": {
             "layout": [
diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk
index a140b3b2525..3437a35bdf1 100644
--- a/keyboards/fjlabs/kyuu/rules.mk
+++ b/keyboards/fjlabs/kyuu/rules.mk
@@ -1,14 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
\ No newline at end of file
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json
index e8616b291be..a9d997c67e0 100644
--- a/keyboards/fjlabs/ldk65/info.json
+++ b/keyboards/fjlabs/ldk65/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/ldk65/rules.mk b/keyboards/fjlabs/ldk65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/ldk65/rules.mk
+++ b/keyboards/fjlabs/ldk65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
index db91dbb021c..0f5b1e13bca 100644
--- a/keyboards/fjlabs/midway60/info.json
+++ b/keyboards/fjlabs/midway60/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": [
         "60_ansi",
         "60_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/midway60/rules.mk b/keyboards/fjlabs/midway60/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/midway60/rules.mk
+++ b/keyboards/fjlabs/midway60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 8c42aa97b64..de26f98ebe6 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -38,6 +38,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/mk61rgbansi/rules.mk
+++ b/keyboards/fjlabs/mk61rgbansi/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json
index 2d9e806101e..73f4f754c31 100644
--- a/keyboards/fjlabs/peaker/info.json
+++ b/keyboards/fjlabs/peaker/info.json
@@ -15,6 +15,13 @@
     "diode_direction": "COL2ROW",
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_tkl_all": {
             "layout": [
diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/peaker/rules.mk
+++ b/keyboards/fjlabs/peaker/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json
index 6757372bf9f..c4f3caf2879 100644
--- a/keyboards/fjlabs/polaris/info.json
+++ b/keyboards/fjlabs/polaris/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "community_layouts": [
         "60_ansi",
         "60_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/polaris/rules.mk b/keyboards/fjlabs/polaris/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/polaris/rules.mk
+++ b/keyboards/fjlabs/polaris/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index dd717bb68a8..b5940b9c527 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -34,6 +34,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layout_aliases": {
         "LAYOUT_64key": "LAYOUT_64_ansi"
     },
diff --git a/keyboards/fjlabs/ready100/rules.mk b/keyboards/fjlabs/ready100/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/ready100/rules.mk
+++ b/keyboards/fjlabs/ready100/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json
index f71ad6fca21..ef9cf0e872b 100644
--- a/keyboards/fjlabs/sinanju/info.json
+++ b/keyboards/fjlabs/sinanju/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "layouts": {
         "LAYOUT_60_ansi_wkl": {
             "layout": [
diff --git a/keyboards/fjlabs/sinanju/rules.mk b/keyboards/fjlabs/sinanju/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/sinanju/rules.mk
+++ b/keyboards/fjlabs/sinanju/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
index 9f34f4aa528..e825ae335e7 100644
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -18,6 +18,13 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
     },
diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/sinanjuwk/rules.mk
+++ b/keyboards/fjlabs/sinanjuwk/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # 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/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index ecc495d59a9..12103d10586 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -34,6 +34,14 @@
     },
     "processor": "at90usb646",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": [
         "tkl_ansi",
         "tkl_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/solanis/rules.mk b/keyboards/fjlabs/solanis/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/solanis/rules.mk
+++ b/keyboards/fjlabs/solanis/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 822d9662d42..331bae459c0 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -33,6 +33,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "layouts": {
         "LAYOUT_2u_bs": {
             "layout": [
diff --git a/keyboards/fjlabs/swordfish/rules.mk b/keyboards/fjlabs/swordfish/rules.mk
index 8bb5a64bff4..3437a35bdf1 100644
--- a/keyboards/fjlabs/swordfish/rules.mk
+++ b/keyboards/fjlabs/swordfish/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index f161284ae01..69ff0690a18 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -38,6 +38,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/fjlabs/tf60ansi/rules.mk b/keyboards/fjlabs/tf60ansi/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf60ansi/rules.mk
+++ b/keyboards/fjlabs/tf60ansi/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index e3051c0da7b..337a06843f1 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -38,6 +38,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["60_ansi_arrow"],
     "layouts": {
         "LAYOUT_60_ansi_arrow": {
diff --git a/keyboards/fjlabs/tf60v2/rules.mk b/keyboards/fjlabs/tf60v2/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf60v2/rules.mk
+++ b/keyboards/fjlabs/tf60v2/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index ab105ff4a9f..dd567c63b85 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -38,6 +38,14 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "command": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "community_layouts": ["65_ansi"],
     "layouts": {
         "LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/tf65rgbv2/rules.mk b/keyboards/fjlabs/tf65rgbv2/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf65rgbv2/rules.mk
+++ b/keyboards/fjlabs/tf65rgbv2/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c
index 1ab95c54a56..5b8838c3b2a 100755
--- a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c
+++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL ,
 			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
 		};
\ No newline at end of file
diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c
index 1ab95c54a56..5b8838c3b2a 100755
--- a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c
+++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL ,
 			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
 		};
\ No newline at end of file
diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c
deleted file mode 100644
index 987e816ee9b..00000000000
--- a/keyboards/flehrad/bigswitch/bigswitch.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2018 QMK Contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "quantum.h"
-
-volatile uint8_t runonce = true;
-static uint16_t my_timer;
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-  my_timer = timer_read();
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-#if defined(RGBLIGHT_ENABLE)
-  if (runonce && timer_elapsed(my_timer) > 1000) {
-    runonce = false;
-    rgblight_sethsv_noeeprom(0x0, 0xff, 0x80);
-    rgblight_mode_noeeprom(9);
-    rgblight_enable_noeeprom();
-  }
-#endif
-}
diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h
deleted file mode 100644
index 44163932472..00000000000
--- a/keyboards/flehrad/bigswitch/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2018 QMK Contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    false \
-)
diff --git a/keyboards/flehrad/bigswitch/keyboard.json b/keyboards/flehrad/bigswitch/keyboard.json
index a56c0b1e9ef..ac68db1a358 100644
--- a/keyboards/flehrad/bigswitch/keyboard.json
+++ b/keyboards/flehrad/bigswitch/keyboard.json
@@ -1,36 +1,15 @@
 {
-    "keyboard_name": "BigSwitch PCB",
     "manufacturer": "flehrad",
+    "keyboard_name": "BigSwitch PCB",
     "maintainer": "qmk",
-    "usb": {
-        "vid": "0x1209",
-        "pid": "0xB195",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 8,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
+    "debounce": 50,
+    "development_board": "promicro",
+    "diode_direction": "ROW2COL",
     "features": {
         "bootmagic": false,
-        "command": true,
         "console": true,
-        "extrakey": false,
-        "mousekey": false,
+        "extrakey": true,
+        "mousekey": true,
         "nkro": false,
         "rgblight": true
     },
@@ -38,10 +17,33 @@
         "cols": ["B6"],
         "rows": ["B5"]
     },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 50,
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "val": 127
+        },
+        "led_count": 8
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xB195",
+        "vid": "0x1209"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c
index 210d001236c..f5d99b656ba 100644
--- a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c
@@ -16,12 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#define KC_OSX_EJECT 0x66
-#define LOCK_OSX LSFT(LCTL(KC_OSX_EJECT))
-#define SLEEP_OSX LALT(LGUI(KC_OSX_EJECT))
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(SLEEP_OSX),
-
+    [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep
 };
diff --git a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c
index f253f4b12e0..621b38605ce 100644
--- a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c
+++ b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c
@@ -18,12 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(KC_TRNS),
-
-    [1] = LAYOUT(KC_TRNS),
-
-    [2] = LAYOUT(KC_TRNS),
-
-    [3] = LAYOUT(KC_TRNS)
+    [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep
 };
diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json
deleted file mode 100644
index bdc94b3eb94..00000000000
--- a/keyboards/fluorite/info.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "keyboard_name": "fluorite",
-    "manufacturer": "ihotsuno",
-    "url": "",
-    "maintainer": "ihotsuno, qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 3.5, "y": 0},
-                {"matrix": [0, 2], "x": 4.5, "y": 0},
-                {"matrix": [0, 3], "x": 5.5, "y": 0},
-                {"matrix": [0, 4], "x": 6.5, "y": 0},
-                {"matrix": [0, 5], "x": 7.5, "y": 1},
-                {"matrix": [0, 6], "x": 8.5, "y": 1},
-                {"matrix": [0, 7], "x": 9.5, "y": 1},
-                {"matrix": [0, 8], "x": 10.5, "y": 1},
-                {"matrix": [8, 8], "x": 12.5, "y": 1},
-                {"matrix": [8, 7], "x": 13.5, "y": 1},
-                {"matrix": [8, 6], "x": 14.5, "y": 1},
-                {"matrix": [8, 5], "x": 15.5, "y": 1},
-                {"matrix": [8, 4], "x": 16.5, "y": 0},
-                {"matrix": [8, 3], "x": 17.5, "y": 0},
-                {"matrix": [8, 2], "x": 18.5, "y": 0},
-                {"matrix": [8, 1], "x": 19.5, "y": 0},
-                {"matrix": [1, 1], "x": 3.25, "y": 1},
-                {"matrix": [1, 2], "x": 4.25, "y": 1},
-                {"matrix": [1, 3], "x": 5.25, "y": 1},
-                {"matrix": [1, 4], "x": 6.25, "y": 1},
-                {"matrix": [1, 5], "x": 7.5, "y": 2},
-                {"matrix": [1, 6], "x": 8.5, "y": 2},
-                {"matrix": [1, 7], "x": 9.5, "y": 2},
-                {"matrix": [1, 8], "x": 10.5, "y": 2},
-                {"matrix": [9, 8], "x": 12.5, "y": 2},
-                {"matrix": [9, 7], "x": 13.5, "y": 2},
-                {"matrix": [9, 6], "x": 14.5, "y": 2},
-                {"matrix": [9, 5], "x": 15.5, "y": 2},
-                {"matrix": [9, 4], "x": 16.75, "y": 1},
-                {"matrix": [9, 3], "x": 17.75, "y": 1},
-                {"matrix": [9, 2], "x": 18.75, "y": 1},
-                {"matrix": [9, 1], "x": 19.75, "y": 1},
-                {"matrix": [2, 0], "x": 1.5, "y": 2},
-                {"matrix": [2, 1], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [2, 3], "x": 5, "y": 2},
-                {"matrix": [2, 4], "x": 6, "y": 2},
-                {"matrix": [2, 5], "x": 7.5, "y": 3},
-                {"matrix": [2, 6], "x": 8.5, "y": 3},
-                {"matrix": [2, 7], "x": 9.5, "y": 3},
-                {"matrix": [2, 8], "x": 10.5, "y": 3},
-                {"matrix": [10, 8], "x": 12.5, "y": 3},
-                {"matrix": [10, 7], "x": 13.5, "y": 3},
-                {"matrix": [10, 6], "x": 14.5, "y": 3},
-                {"matrix": [10, 5], "x": 15.5, "y": 3},
-                {"matrix": [10, 4], "x": 17, "y": 2},
-                {"matrix": [10, 3], "x": 18, "y": 2},
-                {"matrix": [10, 2], "x": 19, "y": 2},
-                {"matrix": [10, 1], "x": 20, "y": 2},
-                {"matrix": [10, 0], "x": 21.5, "y": 2},
-                {"matrix": [3, 0], "x": 1.5, "y": 3},
-                {"matrix": [3, 1], "x": 2.5, "y": 3},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 4},
-                {"matrix": [3, 6], "x": 8.5, "y": 4},
-                {"matrix": [3, 7], "x": 9.5, "y": 4},
-                {"matrix": [3, 8], "x": 10.5, "y": 4},
-                {"matrix": [11, 8], "x": 12.5, "y": 4},
-                {"matrix": [11, 7], "x": 13.5, "y": 4},
-                {"matrix": [11, 6], "x": 14.5, "y": 4},
-                {"matrix": [11, 5], "x": 15.5, "y": 4},
-                {"matrix": [11, 4], "x": 17.5, "y": 3},
-                {"matrix": [11, 3], "x": 18.5, "y": 3},
-                {"matrix": [11, 2], "x": 19.5, "y": 3},
-                {"matrix": [11, 1], "x": 20.5, "y": 3},
-                {"matrix": [11, 0], "x": 21.5, "y": 3},
-                {"matrix": [4, 0], "x": 1.75, "y": 4},
-                {"matrix": [4, 1], "x": 2.75, "y": 4},
-                {"matrix": [4, 2], "x": 3.75, "y": 4},
-                {"matrix": [4, 3], "x": 4.75, "y": 4},
-                {"matrix": [4, 4], "x": 5.75, "y": 4},
-                {"matrix": [4, 5], "x": 7.5, "y": 5},
-                {"matrix": [4, 6], "x": 8.5, "y": 5},
-                {"matrix": [4, 7], "x": 9.5, "y": 5},
-                {"matrix": [4, 8], "x": 10.5, "y": 5},
-                {"matrix": [12, 8], "x": 12.5, "y": 5},
-                {"matrix": [12, 7], "x": 13.5, "y": 5},
-                {"matrix": [12, 6], "x": 14.5, "y": 5},
-                {"matrix": [12, 5], "x": 15.5, "y": 5},
-                {"matrix": [12, 4], "x": 17.25, "y": 4},
-                {"matrix": [12, 3], "x": 18.25, "y": 4},
-                {"matrix": [12, 2], "x": 19.25, "y": 4},
-                {"matrix": [12, 1], "x": 20.25, "y": 4},
-                {"matrix": [12, 0], "x": 21.25, "y": 4},
-                {"matrix": [5, 0], "x": 2, "y": 5},
-                {"matrix": [5, 1], "x": 3, "y": 5},
-                {"matrix": [5, 2], "x": 4, "y": 5},
-                {"matrix": [5, 3], "x": 5, "y": 5},
-                {"matrix": [5, 4], "x": 6, "y": 5},
-                {"matrix": [5, 5], "x": 7.5, "y": 6},
-                {"matrix": [5, 6], "x": 8.5, "y": 6},
-                {"matrix": [5, 7], "x": 9.5, "y": 6},
-                {"matrix": [5, 8], "x": 10.5, "y": 6},
-                {"matrix": [13, 8], "x": 12.5, "y": 6},
-                {"matrix": [13, 7], "x": 13.5, "y": 6},
-                {"matrix": [13, 6], "x": 14.5, "y": 6},
-                {"matrix": [13, 5], "x": 15.5, "y": 6},
-                {"matrix": [13, 4], "x": 17, "y": 5},
-                {"matrix": [13, 3], "x": 18, "y": 5},
-                {"matrix": [13, 2], "x": 19, "y": 5},
-                {"matrix": [13, 1], "x": 20, "y": 5},
-                {"matrix": [13, 0], "x": 21, "y": 5},
-                {"matrix": [6, 0], "x": 2.25, "y": 6},
-                {"matrix": [6, 1], "x": 3.25, "y": 6},
-                {"matrix": [6, 2], "x": 4.25, "y": 6},
-                {"matrix": [6, 3], "x": 5.25, "y": 6},
-                {"matrix": [6, 4], "x": 6.25, "y": 6},
-                {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25},
-                {"matrix": [6, 6], "x": 8.5, "y": 7},
-                {"matrix": [6, 7], "x": 9.5, "y": 7},
-                {"matrix": [6, 8], "x": 10.5, "y": 7},
-                {"matrix": [14, 8], "x": 12.5, "y": 7},
-                {"matrix": [14, 7], "x": 13.5, "y": 7},
-                {"matrix": [14, 6], "x": 14.5, "y": 7},
-                {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25},
-                {"matrix": [14, 4], "x": 16.75, "y": 6},
-                {"matrix": [14, 3], "x": 17.75, "y": 6},
-                {"matrix": [14, 2], "x": 18.75, "y": 6},
-                {"matrix": [14, 1], "x": 19.75, "y": 6},
-                {"matrix": [14, 0], "x": 20.75, "y": 6},
-                {"matrix": [7, 0], "x": 0.25, "y": 3},
-                {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5},
-                {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5},
-                {"matrix": [7, 3], "x": 1, "y": 6},
-                {"matrix": [7, 4], "x": 0, "y": 6},
-                {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25},
-                {"matrix": [7, 6], "x": 5.875, "y": 7},
-                {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25},
-                {"matrix": [7, 8], "x": 10.5, "y": 8},
-                {"matrix": [15, 8], "x": 12.5, "y": 8},
-                {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25},
-                {"matrix": [15, 6], "x": 17.125, "y": 7},
-                {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25},
-                {"matrix": [15, 4], "x": 23, "y": 6},
-                {"matrix": [15, 3], "x": 22, "y": 6},
-                {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5},
-                {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5},
-                {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/fluorite/keyboard.json b/keyboards/fluorite/keyboard.json
new file mode 100644
index 00000000000..ca23f773b0e
--- /dev/null
+++ b/keyboards/fluorite/keyboard.json
@@ -0,0 +1,173 @@
+{
+    "keyboard_name": "fluorite",
+    "manufacturer": "ihotsuno",
+    "url": "",
+    "maintainer": "ihotsuno, qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 1},
+                {"matrix": [0, 6], "x": 8.5, "y": 1},
+                {"matrix": [0, 7], "x": 9.5, "y": 1},
+                {"matrix": [0, 8], "x": 10.5, "y": 1},
+                {"matrix": [8, 8], "x": 12.5, "y": 1},
+                {"matrix": [8, 7], "x": 13.5, "y": 1},
+                {"matrix": [8, 6], "x": 14.5, "y": 1},
+                {"matrix": [8, 5], "x": 15.5, "y": 1},
+                {"matrix": [8, 4], "x": 16.5, "y": 0},
+                {"matrix": [8, 3], "x": 17.5, "y": 0},
+                {"matrix": [8, 2], "x": 18.5, "y": 0},
+                {"matrix": [8, 1], "x": 19.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.5, "y": 2},
+                {"matrix": [1, 6], "x": 8.5, "y": 2},
+                {"matrix": [1, 7], "x": 9.5, "y": 2},
+                {"matrix": [1, 8], "x": 10.5, "y": 2},
+                {"matrix": [9, 8], "x": 12.5, "y": 2},
+                {"matrix": [9, 7], "x": 13.5, "y": 2},
+                {"matrix": [9, 6], "x": 14.5, "y": 2},
+                {"matrix": [9, 5], "x": 15.5, "y": 2},
+                {"matrix": [9, 4], "x": 16.75, "y": 1},
+                {"matrix": [9, 3], "x": 17.75, "y": 1},
+                {"matrix": [9, 2], "x": 18.75, "y": 1},
+                {"matrix": [9, 1], "x": 19.75, "y": 1},
+                {"matrix": [2, 0], "x": 1.5, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 3},
+                {"matrix": [2, 6], "x": 8.5, "y": 3},
+                {"matrix": [2, 7], "x": 9.5, "y": 3},
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [10, 8], "x": 12.5, "y": 3},
+                {"matrix": [10, 7], "x": 13.5, "y": 3},
+                {"matrix": [10, 6], "x": 14.5, "y": 3},
+                {"matrix": [10, 5], "x": 15.5, "y": 3},
+                {"matrix": [10, 4], "x": 17, "y": 2},
+                {"matrix": [10, 3], "x": 18, "y": 2},
+                {"matrix": [10, 2], "x": 19, "y": 2},
+                {"matrix": [10, 1], "x": 20, "y": 2},
+                {"matrix": [10, 0], "x": 21.5, "y": 2},
+                {"matrix": [3, 0], "x": 1.5, "y": 3},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 4},
+                {"matrix": [3, 6], "x": 8.5, "y": 4},
+                {"matrix": [3, 7], "x": 9.5, "y": 4},
+                {"matrix": [3, 8], "x": 10.5, "y": 4},
+                {"matrix": [11, 8], "x": 12.5, "y": 4},
+                {"matrix": [11, 7], "x": 13.5, "y": 4},
+                {"matrix": [11, 6], "x": 14.5, "y": 4},
+                {"matrix": [11, 5], "x": 15.5, "y": 4},
+                {"matrix": [11, 4], "x": 17.5, "y": 3},
+                {"matrix": [11, 3], "x": 18.5, "y": 3},
+                {"matrix": [11, 2], "x": 19.5, "y": 3},
+                {"matrix": [11, 1], "x": 20.5, "y": 3},
+                {"matrix": [11, 0], "x": 21.5, "y": 3},
+                {"matrix": [4, 0], "x": 1.75, "y": 4},
+                {"matrix": [4, 1], "x": 2.75, "y": 4},
+                {"matrix": [4, 2], "x": 3.75, "y": 4},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4},
+                {"matrix": [4, 5], "x": 7.5, "y": 5},
+                {"matrix": [4, 6], "x": 8.5, "y": 5},
+                {"matrix": [4, 7], "x": 9.5, "y": 5},
+                {"matrix": [4, 8], "x": 10.5, "y": 5},
+                {"matrix": [12, 8], "x": 12.5, "y": 5},
+                {"matrix": [12, 7], "x": 13.5, "y": 5},
+                {"matrix": [12, 6], "x": 14.5, "y": 5},
+                {"matrix": [12, 5], "x": 15.5, "y": 5},
+                {"matrix": [12, 4], "x": 17.25, "y": 4},
+                {"matrix": [12, 3], "x": 18.25, "y": 4},
+                {"matrix": [12, 2], "x": 19.25, "y": 4},
+                {"matrix": [12, 1], "x": 20.25, "y": 4},
+                {"matrix": [12, 0], "x": 21.25, "y": 4},
+                {"matrix": [5, 0], "x": 2, "y": 5},
+                {"matrix": [5, 1], "x": 3, "y": 5},
+                {"matrix": [5, 2], "x": 4, "y": 5},
+                {"matrix": [5, 3], "x": 5, "y": 5},
+                {"matrix": [5, 4], "x": 6, "y": 5},
+                {"matrix": [5, 5], "x": 7.5, "y": 6},
+                {"matrix": [5, 6], "x": 8.5, "y": 6},
+                {"matrix": [5, 7], "x": 9.5, "y": 6},
+                {"matrix": [5, 8], "x": 10.5, "y": 6},
+                {"matrix": [13, 8], "x": 12.5, "y": 6},
+                {"matrix": [13, 7], "x": 13.5, "y": 6},
+                {"matrix": [13, 6], "x": 14.5, "y": 6},
+                {"matrix": [13, 5], "x": 15.5, "y": 6},
+                {"matrix": [13, 4], "x": 17, "y": 5},
+                {"matrix": [13, 3], "x": 18, "y": 5},
+                {"matrix": [13, 2], "x": 19, "y": 5},
+                {"matrix": [13, 1], "x": 20, "y": 5},
+                {"matrix": [13, 0], "x": 21, "y": 5},
+                {"matrix": [6, 0], "x": 2.25, "y": 6},
+                {"matrix": [6, 1], "x": 3.25, "y": 6},
+                {"matrix": [6, 2], "x": 4.25, "y": 6},
+                {"matrix": [6, 3], "x": 5.25, "y": 6},
+                {"matrix": [6, 4], "x": 6.25, "y": 6},
+                {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25},
+                {"matrix": [6, 6], "x": 8.5, "y": 7},
+                {"matrix": [6, 7], "x": 9.5, "y": 7},
+                {"matrix": [6, 8], "x": 10.5, "y": 7},
+                {"matrix": [14, 8], "x": 12.5, "y": 7},
+                {"matrix": [14, 7], "x": 13.5, "y": 7},
+                {"matrix": [14, 6], "x": 14.5, "y": 7},
+                {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25},
+                {"matrix": [14, 4], "x": 16.75, "y": 6},
+                {"matrix": [14, 3], "x": 17.75, "y": 6},
+                {"matrix": [14, 2], "x": 18.75, "y": 6},
+                {"matrix": [14, 1], "x": 19.75, "y": 6},
+                {"matrix": [14, 0], "x": 20.75, "y": 6},
+                {"matrix": [7, 0], "x": 0.25, "y": 3},
+                {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5},
+                {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5},
+                {"matrix": [7, 3], "x": 1, "y": 6},
+                {"matrix": [7, 4], "x": 0, "y": 6},
+                {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25},
+                {"matrix": [7, 6], "x": 5.875, "y": 7},
+                {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 8},
+                {"matrix": [15, 8], "x": 12.5, "y": 8},
+                {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25},
+                {"matrix": [15, 6], "x": 17.125, "y": 7},
+                {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25},
+                {"matrix": [15, 4], "x": 23, "y": 6},
+                {"matrix": [15, 3], "x": 22, "y": 6},
+                {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5},
+                {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5},
+                {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk
deleted file mode 100644
index 139055a96bd..00000000000
--- a/keyboards/fluorite/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
deleted file mode 100644
index 6d2aadcb437..00000000000
--- a/keyboards/flxlb/zplit/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "zplit",
-    "manufacturer": "fluxlab",
-    "url": "https://github.com/cccywj/qmk_firmware",
-    "maintainer": "flxlb",
-    "usb": {
-        "vid": "0x7076",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B3", "D6", "D7", "B4", "B5"],
-        "rows": ["D4", "F5", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B0", "pin_b": "D2"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 16,
-        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
-        "split_count": [8, 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": "D3"
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/flxlb/zplit/keyboard.json b/keyboards/flxlb/zplit/keyboard.json
new file mode 100644
index 00000000000..2d5c33f49f3
--- /dev/null
+++ b/keyboards/flxlb/zplit/keyboard.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "zplit",
+    "manufacturer": "fluxlab",
+    "url": "https://github.com/cccywj/qmk_firmware",
+    "maintainer": "flxlb",
+    "usb": {
+        "vid": "0x7076",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B3", "D6", "D7", "B4", "B5"],
+        "rows": ["D4", "F5", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B0", "pin_b": "D2"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 16,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
+        "split_count": [8, 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": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk
deleted file mode 100644
index 7b181ca73e5..00000000000
--- a/keyboards/flxlb/zplit/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/for_science/keymaps/default/keymap.c b/keyboards/for_science/keymaps/default/keymap.c
index 7da986a0292..15b1a01d474 100644
--- a/keyboards/for_science/keymaps/default/keymap.c
+++ b/keyboards/for_science/keymaps/default/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [_FUNCT] = LAYOUT_split_4x5_3(
-    QK_BOOT,   _______, _______, _______, LOCK,       MAC_LCK, _______, _______, _______, MAGIC_SWAP_LALT_LGUI,
+    QK_BOOT,   _______, _______, _______, LOCK,       MAC_LCK, _______, _______, _______, AG_LSWP,
     _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json
index 0ae02161cd5..f651c784247 100644
--- a/keyboards/fortitude60/rev1/keyboard.json
+++ b/keyboards/fortitude60/rev1/keyboard.json
@@ -24,10 +24,16 @@
     "pin": "B5"
   },
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": false,
+    "mousekey": true,
+    "extrakey": true
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk
index 9302b674251..ef158b8cf08 100644
--- a/keyboards/fortitude60/rules.mk
+++ b/keyboards/fortitude60/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = fortitude60/rev1
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index 0d2ce4aecac..4086ff969fe 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -15,6 +15,12 @@
   "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "bootmagic": true,
+    "mousekey": true,
+    "extrakey": true,
+    "nkro": true
+  },
   "community_layouts": ["ortho_5x12"],
   "layouts": {
     "LAYOUT_ortho_5x12": {
diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk
index ee623488daa..16051206467 100755
--- a/keyboards/fractal/rules.mk
+++ b/keyboards/fractal/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index 2e99c5806b2..8a4aed19484 100644
--- a/keyboards/frobiac/blackbowl/info.json
+++ b/keyboards/frobiac/blackbowl/info.json
@@ -13,7 +13,9 @@
         "dynamic_macro": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false
+        "nkro": false,
+        "ps2": true,
+        "ps2_mouse": true
     },
     "build": {
         "lto": true
diff --git a/keyboards/frobiac/blackbowl/rules.mk b/keyboards/frobiac/blackbowl/rules.mk
index 4e81c7280cd..3b95c118432 100644
--- a/keyboards/frobiac/blackbowl/rules.mk
+++ b/keyboards/frobiac/blackbowl/rules.mk
@@ -4,6 +4,4 @@ CUSTOM_MATRIX = lite
 I2C_DRIVER_REQUIRED = yes
 SRC += matrix.c
 
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
 PS2_DRIVER = usart
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
deleted file mode 100644
index 4864e12fbcf..00000000000
--- a/keyboards/frooastboard/walnut/info.json
+++ /dev/null
@@ -1,301 +0,0 @@
-{
-    "keyboard_name": "Frooastboard Walnut",
-    "manufacturer": "Frooastside",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
-    "maintainer": "Frooastside",
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": false,
-        "mousekey": false,
-        "nkro": true
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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
-        },
-        "default": {
-            "animation": "rainbow_moving_chevron",
-            "speed": 191
-        },
-        "driver": "is31fl3737",
-        "max_brightness": 191,
-        "sleep": true
-    },
-    "build": {
-        "lto": true
-    },
-    "matrix_pins": {
-        "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
-        "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"]
-    },
-    "usb": {
-        "vid": "0x4642",
-        "pid": "0x776E",
-        "device_version": "1.0.0"
-    },
-    "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
-    "layout_aliases": {
-        "LAYOUT_ansi": "LAYOUT_tkl_nofrow_ansi",
-        "LAYOUT_iso": "LAYOUT_tkl_nofrow_iso"
-    },
-    "layouts": {
-        "LAYOUT_tkl_nofrow_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": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 2], "x": 2.5, "y": 1},
-                {"matrix": [2, 3], "x": 3.5, "y": 1},
-                {"matrix": [2, 4], "x": 4.5, "y": 1},
-                {"matrix": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [2, 6], "x": 6.5, "y": 1},
-                {"matrix": [2, 7], "x": 7.5, "y": 1},
-                {"matrix": [3, 0], "x": 8.5, "y": 1},
-                {"matrix": [3, 1], "x": 9.5, "y": 1},
-                {"matrix": [3, 2], "x": 10.5, "y": 1},
-                {"matrix": [3, 3], "x": 11.5, "y": 1},
-                {"matrix": [3, 4], "x": 12.5, "y": 1},
-                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [7, 5], "x": 15.5, "y": 1},
-                {"matrix": [7, 6], "x": 16.5, "y": 1},
-                {"matrix": [7, 7], "x": 17.5, "y": 1},
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [4, 2], "x": 2.75, "y": 2},
-                {"matrix": [4, 3], "x": 3.75, "y": 2},
-                {"matrix": [4, 4], "x": 4.75, "y": 2},
-                {"matrix": [4, 5], "x": 5.75, "y": 2},
-                {"matrix": [4, 6], "x": 6.75, "y": 2},
-                {"matrix": [4, 7], "x": 7.75, "y": 2},
-                {"matrix": [5, 0], "x": 8.75, "y": 2},
-                {"matrix": [5, 1], "x": 9.75, "y": 2},
-                {"matrix": [5, 2], "x": 10.75, "y": 2},
-                {"matrix": [5, 3], "x": 11.75, "y": 2},
-                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [6, 3], "x": 3.25, "y": 3},
-                {"matrix": [6, 4], "x": 4.25, "y": 3},
-                {"matrix": [6, 5], "x": 5.25, "y": 3},
-                {"matrix": [6, 6], "x": 6.25, "y": 3},
-                {"matrix": [6, 7], "x": 7.25, "y": 3},
-                {"matrix": [7, 0], "x": 8.25, "y": 3},
-                {"matrix": [7, 1], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [7, 3], "x": 11.25, "y": 3},
-                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "x": 16.5, "y": 3},
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [1, 6], "x": 15.5, "y": 4},
-                {"matrix": [3, 7], "x": 16.5, "y": 4},
-                {"matrix": [1, 7], "x": 17.5, "y": 4}
-            ]
-        },
-        "LAYOUT_tkl_nofrow_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": [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": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 2], "x": 2.5, "y": 1},
-                {"matrix": [2, 3], "x": 3.5, "y": 1},
-                {"matrix": [2, 4], "x": 4.5, "y": 1},
-                {"matrix": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [2, 6], "x": 6.5, "y": 1},
-                {"matrix": [2, 7], "x": 7.5, "y": 1},
-                {"matrix": [3, 0], "x": 8.5, "y": 1},
-                {"matrix": [3, 1], "x": 9.5, "y": 1},
-                {"matrix": [3, 2], "x": 10.5, "y": 1},
-                {"matrix": [3, 3], "x": 11.5, "y": 1},
-                {"matrix": [3, 4], "x": 12.5, "y": 1},
-                {"matrix": [7, 5], "x": 15.5, "y": 1},
-                {"matrix": [7, 6], "x": 16.5, "y": 1},
-                {"matrix": [7, 7], "x": 17.5, "y": 1},
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [4, 2], "x": 2.75, "y": 2},
-                {"matrix": [4, 3], "x": 3.75, "y": 2},
-                {"matrix": [4, 4], "x": 4.75, "y": 2},
-                {"matrix": [4, 5], "x": 5.75, "y": 2},
-                {"matrix": [4, 6], "x": 6.75, "y": 2},
-                {"matrix": [4, 7], "x": 7.75, "y": 2},
-                {"matrix": [5, 0], "x": 8.75, "y": 2},
-                {"matrix": [5, 1], "x": 9.75, "y": 2},
-                {"matrix": [5, 2], "x": 10.75, "y": 2},
-                {"matrix": [5, 3], "x": 11.75, "y": 2},
-                {"matrix": [5, 4], "x": 12.75, "y": 2},
-                {"matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [6, 1], "x": 1.25, "y": 3},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [6, 3], "x": 3.25, "y": 3},
-                {"matrix": [6, 4], "x": 4.25, "y": 3},
-                {"matrix": [6, 5], "x": 5.25, "y": 3},
-                {"matrix": [6, 6], "x": 6.25, "y": 3},
-                {"matrix": [6, 7], "x": 7.25, "y": 3},
-                {"matrix": [7, 0], "x": 8.25, "y": 3},
-                {"matrix": [7, 1], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [7, 3], "x": 11.25, "y": 3},
-                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "x": 16.5, "y": 3},
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [1, 6], "x": 15.5, "y": 4},
-                {"matrix": [3, 7], "x": 16.5, "y": 4},
-                {"matrix": [1, 7], "x": 17.5, "y": 4}
-            ]
-        },
-        "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": [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": [5, 5], "x": 15.5, "y": 0},
-                {"matrix": [5, 6], "x": 16.5, "y": 0},
-                {"matrix": [5, 7], "x": 17.5, "y": 0},
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [2, 2], "x": 2.5, "y": 1},
-                {"matrix": [2, 3], "x": 3.5, "y": 1},
-                {"matrix": [2, 4], "x": 4.5, "y": 1},
-                {"matrix": [2, 5], "x": 5.5, "y": 1},
-                {"matrix": [2, 6], "x": 6.5, "y": 1},
-                {"matrix": [2, 7], "x": 7.5, "y": 1},
-                {"matrix": [3, 0], "x": 8.5, "y": 1},
-                {"matrix": [3, 1], "x": 9.5, "y": 1},
-                {"matrix": [3, 2], "x": 10.5, "y": 1},
-                {"matrix": [3, 3], "x": 11.5, "y": 1},
-                {"matrix": [3, 4], "x": 12.5, "y": 1},
-                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [7, 5], "x": 15.5, "y": 1},
-                {"matrix": [7, 6], "x": 16.5, "y": 1},
-                {"matrix": [7, 7], "x": 17.5, "y": 1},
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [4, 2], "x": 2.75, "y": 2},
-                {"matrix": [4, 3], "x": 3.75, "y": 2},
-                {"matrix": [4, 4], "x": 4.75, "y": 2},
-                {"matrix": [4, 5], "x": 5.75, "y": 2},
-                {"matrix": [4, 6], "x": 6.75, "y": 2},
-                {"matrix": [4, 7], "x": 7.75, "y": 2},
-                {"matrix": [5, 0], "x": 8.75, "y": 2},
-                {"matrix": [5, 1], "x": 9.75, "y": 2},
-                {"matrix": [5, 2], "x": 10.75, "y": 2},
-                {"matrix": [5, 3], "x": 11.75, "y": 2},
-                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [6, 1], "x": 1.25, "y": 3},
-                {"matrix": [6, 2], "x": 2.25, "y": 3},
-                {"matrix": [6, 3], "x": 3.25, "y": 3},
-                {"matrix": [6, 4], "x": 4.25, "y": 3},
-                {"matrix": [6, 5], "x": 5.25, "y": 3},
-                {"matrix": [6, 6], "x": 6.25, "y": 3},
-                {"matrix": [6, 7], "x": 7.25, "y": 3},
-                {"matrix": [7, 0], "x": 8.25, "y": 3},
-                {"matrix": [7, 1], "x": 9.25, "y": 3},
-                {"matrix": [7, 2], "x": 10.25, "y": 3},
-                {"matrix": [7, 3], "x": 11.25, "y": 3},
-                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 6], "x": 16.5, "y": 3},
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
-                {"matrix": [1, 6], "x": 15.5, "y": 4},
-                {"matrix": [3, 7], "x": 16.5, "y": 4},
-                {"matrix": [1, 7], "x": 17.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/frooastboard/walnut/keyboard.json b/keyboards/frooastboard/walnut/keyboard.json
new file mode 100644
index 00000000000..4387452d381
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keyboard.json
@@ -0,0 +1,302 @@
+{
+    "keyboard_name": "Frooastboard Walnut",
+    "manufacturer": "Frooastside",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
+    "maintainer": "Frooastside",
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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
+        },
+        "default": {
+            "animation": "rainbow_moving_chevron",
+            "speed": 191
+        },
+        "driver": "is31fl3737",
+        "max_brightness": 191,
+        "sleep": true
+    },
+    "build": {
+        "lto": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
+        "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"]
+    },
+    "usb": {
+        "vid": "0x4642",
+        "pid": "0x776E",
+        "device_version": "1.0.0"
+    },
+    "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_nofrow_ansi",
+        "LAYOUT_iso": "LAYOUT_tkl_nofrow_iso"
+    },
+    "layouts": {
+        "LAYOUT_tkl_nofrow_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": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_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": [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": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [5, 4], "x": 12.75, "y": 2},
+                {"matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
+            ]
+        },
+        "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": [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": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 2], "x": 2.5, "y": 1},
+                {"matrix": [2, 3], "x": 3.5, "y": 1},
+                {"matrix": [2, 4], "x": 4.5, "y": 1},
+                {"matrix": [2, 5], "x": 5.5, "y": 1},
+                {"matrix": [2, 6], "x": 6.5, "y": 1},
+                {"matrix": [2, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 0], "x": 8.5, "y": 1},
+                {"matrix": [3, 1], "x": 9.5, "y": 1},
+                {"matrix": [3, 2], "x": 10.5, "y": 1},
+                {"matrix": [3, 3], "x": 11.5, "y": 1},
+                {"matrix": [3, 4], "x": 12.5, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 15.5, "y": 1},
+                {"matrix": [7, 6], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [4, 7], "x": 7.75, "y": 2},
+                {"matrix": [5, 0], "x": 8.75, "y": 2},
+                {"matrix": [5, 1], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2},
+                {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "x": 5.25, "y": 3},
+                {"matrix": [6, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 7], "x": 7.25, "y": 3},
+                {"matrix": [7, 0], "x": 8.25, "y": 3},
+                {"matrix": [7, 1], "x": 9.25, "y": 3},
+                {"matrix": [7, 2], "x": 10.25, "y": 3},
+                {"matrix": [7, 3], "x": 11.25, "y": 3},
+                {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 16.5, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [1, 6], "x": 15.5, "y": 4},
+                {"matrix": [3, 7], "x": 16.5, "y": 4},
+                {"matrix": [1, 7], "x": 17.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/frooastboard/walnut/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default/keymap.c
index 195b3c150bb..57058d5de72 100644
--- a/keyboards/frooastboard/walnut/keymaps/default/keymap.c
+++ b/keyboards/frooastboard/walnut/keymaps/default/keymap.c
@@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUI, RGB_SPI,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
-		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+		KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
 };
diff --git a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
index f28645cf2f2..b9abd07d7d3 100644
--- a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
+++ b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c
@@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUI, RGB_SPI,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
-		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+		KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
 };
diff --git a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
index f42b67db2db..e6dd393f15c 100644
--- a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
+++ b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c
@@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_SAI, RGB_HUI, RGB_SPI,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
-		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+		KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
 };
diff --git a/keyboards/frooastboard/walnut/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
index f5022057612..1fdc5a100df 100644
--- a/keyboards/frooastboard/walnut/keymaps/via/keymap.c
+++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c
@@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            RGB_VAI,
-		KC_TRNS, GUI_TOG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
+		KC_TRNS, GU_TOGG, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_RMOD,RGB_VAD, RGB_MOD)
 };
\ No newline at end of file
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
deleted file mode 100644
index c529890fb51..00000000000
--- a/keyboards/frooastboard/walnut/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes         # Enable keyboard RGB matrix
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
deleted file mode 100644
index d153f9f834a..00000000000
--- a/keyboards/fungo/rev1/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "keyboard_name": "FungoSplit",
-  "manufacturer": "Fungo",
-  "url": "https://github.com/bojiguard/",
-  "maintainer": "@bojiguard",
-  "usb": {
-    "vid": "0x5892",
-    "pid": "0x1233",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-    "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
-    "io_delay": 15
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D3",
-    "matrix_pins": {
-      "right": {
-        "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
-        "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
-      }
-    }
-  },
-  "qmk": {
-    "tap_keycode_delay": 50
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "debounce": 3,
-  "tapping": {
-    "toggle": 3
-  },
-  "layout_aliases": {
-    "LAYOUT_fungo_split_num": "LAYOUT"
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.375},
-        {"matrix": [0, 2], "x": 2, "y": 0.125},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.125},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6, "y": 0.5},
-
-        {"matrix": [6, 0], "x": 12, "y": 0.5},
-        {"matrix": [6, 1], "x": 13, "y": 0.25},
-        {"matrix": [6, 2], "x": 14, "y": 0.125},
-        {"matrix": [6, 3], "x": 15, "y": 0},
-        {"matrix": [6, 4], "x": 16, "y": 0.125},
-        {"matrix": [6, 5], "x": 17, "y": 0.375},
-        {"matrix": [6, 6], "x": 18, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.375},
-        {"matrix": [1, 2], "x": 2, "y": 1.125},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.125},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-
-        {"matrix": [7, 0], "x": 12, "y": 1.5},
-        {"matrix": [7, 1], "x": 13, "y": 1.25},
-        {"matrix": [7, 2], "x": 14, "y": 1.125},
-        {"matrix": [7, 3], "x": 15, "y": 1},
-        {"matrix": [7, 4], "x": 16, "y": 1.125},
-        {"matrix": [7, 5], "x": 17, "y": 1.375},
-        {"matrix": [7, 6], "x": 18, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.375},
-        {"matrix": [2, 2], "x": 2, "y": 2.125},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.125},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-        {"matrix": [2, 6], "x": 6, "y": 2.5},
-
-        {"matrix": [8, 0], "x": 12, "y": 2.5},
-        {"matrix": [8, 1], "x": 13, "y": 2.25},
-        {"matrix": [8, 2], "x": 14, "y": 2.125},
-        {"matrix": [8, 3], "x": 15, "y": 2},
-        {"matrix": [8, 4], "x": 16, "y": 2.125},
-        {"matrix": [8, 5], "x": 17, "y": 2.375},
-        {"matrix": [8, 6], "x": 18, "y": 2.375},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.375},
-        {"matrix": [3, 1], "x": 1, "y": 3.375},
-        {"matrix": [3, 2], "x": 2, "y": 3.125},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3.125},
-        {"matrix": [3, 5], "x": 5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6, "y": 3.5},
-        {"matrix": [4, 6], "x": 7, "y": 4.25},
-        {"matrix": [5, 2], "x": 8, "y": 4.5},
-
-        {"matrix": [11, 4], "x": 10, "y": 4.5},
-        {"matrix": [10, 0], "x": 11, "y": 4.25},
-        {"matrix": [9, 0], "x": 12, "y": 3.5},
-        {"matrix": [9, 1], "x": 13, "y": 3.25},
-        {"matrix": [9, 2], "x": 14, "y": 3.125},
-        {"matrix": [9, 3], "x": 15, "y": 3},
-        {"matrix": [9, 4], "x": 16, "y": 3.125},
-        {"matrix": [9, 5], "x": 17, "y": 3.375},
-        {"matrix": [9, 6], "x": 18, "y": 3.375},
-
-        {"matrix": [5, 0], "x": 0, "y": 4.375},
-        {"matrix": [5, 1], "x": 1, "y": 4.375},
-        {"matrix": [4, 0], "x": 2, "y": 4.25},
-        {"matrix": [4, 1], "x": 3.25, "y": 4.25},
-        {"matrix": [4, 2], "x": 4.5, "y": 4.5},
-        {"matrix": [4, 3], "x": 5.75, "y": 5},
-        {"matrix": [4, 4], "x": 7, "y": 5.25},
-        {"matrix": [4, 5], "x": 8, "y": 5.5},
-
-        {"matrix": [10, 1], "x": 10, "y": 5.5},
-        {"matrix": [10, 2], "x": 11, "y": 5.25},
-        {"matrix": [10, 3], "x": 12.25, "y": 5},
-        {"matrix": [10, 4], "x": 13.5, "y": 4.5},
-        {"matrix": [10, 5], "x": 14.75, "y": 4.25},
-        {"matrix": [10, 6], "x": 16, "y": 4.25},
-        {"matrix": [11, 5], "x": 17, "y": 4.375},
-        {"matrix": [11, 6], "x": 18, "y": 4.375}
-      ]
-    }
-  }
-}
diff --git a/keyboards/fungo/rev1/keyboard.json b/keyboards/fungo/rev1/keyboard.json
new file mode 100644
index 00000000000..988ba0f6431
--- /dev/null
+++ b/keyboards/fungo/rev1/keyboard.json
@@ -0,0 +1,139 @@
+{
+  "keyboard_name": "FungoSplit",
+  "manufacturer": "Fungo",
+  "url": "https://github.com/bojiguard/",
+  "maintainer": "@bojiguard",
+  "usb": {
+    "vid": "0x5892",
+    "pid": "0x1233",
+    "device_version": "0.0.1"
+  },
+  "features": {
+      "bootmagic": false,
+      "command": false,
+      "console": false,
+      "extrakey": false,
+      "key_lock": true,
+      "mousekey": true,
+      "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+    "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
+    "io_delay": 15
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D3",
+    "matrix_pins": {
+      "right": {
+        "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
+      }
+    }
+  },
+  "qmk": {
+    "tap_keycode_delay": 50
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "debounce": 3,
+  "tapping": {
+    "toggle": 3
+  },
+  "layout_aliases": {
+    "LAYOUT_fungo_split_num": "LAYOUT"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.375},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+        {"matrix": [6, 0], "x": 12, "y": 0.5},
+        {"matrix": [6, 1], "x": 13, "y": 0.25},
+        {"matrix": [6, 2], "x": 14, "y": 0.125},
+        {"matrix": [6, 3], "x": 15, "y": 0},
+        {"matrix": [6, 4], "x": 16, "y": 0.125},
+        {"matrix": [6, 5], "x": 17, "y": 0.375},
+        {"matrix": [6, 6], "x": 18, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.375},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+        {"matrix": [7, 0], "x": 12, "y": 1.5},
+        {"matrix": [7, 1], "x": 13, "y": 1.25},
+        {"matrix": [7, 2], "x": 14, "y": 1.125},
+        {"matrix": [7, 3], "x": 15, "y": 1},
+        {"matrix": [7, 4], "x": 16, "y": 1.125},
+        {"matrix": [7, 5], "x": 17, "y": 1.375},
+        {"matrix": [7, 6], "x": 18, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.375},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+        {"matrix": [8, 0], "x": 12, "y": 2.5},
+        {"matrix": [8, 1], "x": 13, "y": 2.25},
+        {"matrix": [8, 2], "x": 14, "y": 2.125},
+        {"matrix": [8, 3], "x": 15, "y": 2},
+        {"matrix": [8, 4], "x": 16, "y": 2.125},
+        {"matrix": [8, 5], "x": 17, "y": 2.375},
+        {"matrix": [8, 6], "x": 18, "y": 2.375},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.375},
+        {"matrix": [3, 1], "x": 1, "y": 3.375},
+        {"matrix": [3, 2], "x": 2, "y": 3.125},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.125},
+        {"matrix": [3, 5], "x": 5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6, "y": 3.5},
+        {"matrix": [4, 6], "x": 7, "y": 4.25},
+        {"matrix": [5, 2], "x": 8, "y": 4.5},
+
+        {"matrix": [11, 4], "x": 10, "y": 4.5},
+        {"matrix": [10, 0], "x": 11, "y": 4.25},
+        {"matrix": [9, 0], "x": 12, "y": 3.5},
+        {"matrix": [9, 1], "x": 13, "y": 3.25},
+        {"matrix": [9, 2], "x": 14, "y": 3.125},
+        {"matrix": [9, 3], "x": 15, "y": 3},
+        {"matrix": [9, 4], "x": 16, "y": 3.125},
+        {"matrix": [9, 5], "x": 17, "y": 3.375},
+        {"matrix": [9, 6], "x": 18, "y": 3.375},
+
+        {"matrix": [5, 0], "x": 0, "y": 4.375},
+        {"matrix": [5, 1], "x": 1, "y": 4.375},
+        {"matrix": [4, 0], "x": 2, "y": 4.25},
+        {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+        {"matrix": [4, 3], "x": 5.75, "y": 5},
+        {"matrix": [4, 4], "x": 7, "y": 5.25},
+        {"matrix": [4, 5], "x": 8, "y": 5.5},
+
+        {"matrix": [10, 1], "x": 10, "y": 5.5},
+        {"matrix": [10, 2], "x": 11, "y": 5.25},
+        {"matrix": [10, 3], "x": 12.25, "y": 5},
+        {"matrix": [10, 4], "x": 13.5, "y": 4.5},
+        {"matrix": [10, 5], "x": 14.75, "y": 4.25},
+        {"matrix": [10, 6], "x": 16, "y": 4.25},
+        {"matrix": [11, 5], "x": 17, "y": 4.375},
+        {"matrix": [11, 6], "x": 18, "y": 4.375}
+      ]
+    }
+  }
+}
diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk
deleted file mode 100644
index e8d7a7aed53..00000000000
--- a/keyboards/fungo/rev1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no       # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-KEY_LOCK_ENABLE = yes       # kc_lock use
-
-
-OLED_ENABLE = no
-SPLIT_KEYBOARD = yes       # split type
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
index 005dd730b8d..a28777f4f24 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -12,9 +12,12 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include "action.h"
+#include "progmem.h"
 #include "config_engine.h"
 
 // Maximum values for combos
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index a78ddc96ff0..2b62165c51e 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -12,9 +12,12 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include "action.h"
+#include "progmem.h"
 #include "config_engine.h"
 
 // Set defaults
diff --git a/keyboards/geistmaschine/macropod/matrix.c b/keyboards/geistmaschine/macropod/matrix.c
index ebc10e2e5ad..98796133f12 100644
--- a/keyboards/geistmaschine/macropod/matrix.c
+++ b/keyboards/geistmaschine/macropod/matrix.c
@@ -14,8 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "matrix.h"
 #include "pca9555.h"
-#include "quantum.h"
+#include "timer.h"
 
 // PCA9555 i2c address, 0x20: A0 = 0, A1 = 0, A2 = 0
 #define IC1 0x20
diff --git a/keyboards/gl516/a52gl/matrix.c b/keyboards/gl516/a52gl/matrix.c
index 1a97fdfd614..af13768b08e 100644
--- a/keyboards/gl516/a52gl/matrix.c
+++ b/keyboards/gl516/a52gl/matrix.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "matrix.h"
-#include "quantum.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/gl516/j73gl/matrix.c b/keyboards/gl516/j73gl/matrix.c
index 1a97fdfd614..af13768b08e 100644
--- a/keyboards/gl516/j73gl/matrix.c
+++ b/keyboards/gl516/j73gl/matrix.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "matrix.h"
-#include "quantum.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/gl516/n51gl/matrix.c b/keyboards/gl516/n51gl/matrix.c
index 1a97fdfd614..af13768b08e 100644
--- a/keyboards/gl516/n51gl/matrix.c
+++ b/keyboards/gl516/n51gl/matrix.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "matrix.h"
-#include "quantum.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/glenpickle/chimera_ergo/matrix.c b/keyboards/glenpickle/chimera_ergo/matrix.c
index 32d7b09310a..47c3c61e27f 100644
--- a/keyboards/glenpickle/chimera_ergo/matrix.c
+++ b/keyboards/glenpickle/chimera_ergo/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/glenpickle/chimera_ls/matrix.c b/keyboards/glenpickle/chimera_ls/matrix.c
index 9a69724eb78..15a29c5a865 100644
--- a/keyboards/glenpickle/chimera_ls/matrix.c
+++ b/keyboards/glenpickle/chimera_ls/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/glenpickle/chimera_ortho/matrix.c b/keyboards/glenpickle/chimera_ortho/matrix.c
index 9a69724eb78..15a29c5a865 100644
--- a/keyboards/glenpickle/chimera_ortho/matrix.c
+++ b/keyboards/glenpickle/chimera_ortho/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/glenpickle/chimera_ortho_plus/matrix.c b/keyboards/glenpickle/chimera_ortho_plus/matrix.c
index 32d7b09310a..47c3c61e27f 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/matrix.c
+++ b/keyboards/glenpickle/chimera_ortho_plus/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/gmmk/numpad/matrix.c b/keyboards/gmmk/numpad/matrix.c
index 99adb38f184..68d4ab65242 100644
--- a/keyboards/gmmk/numpad/matrix.c
+++ b/keyboards/gmmk/numpad/matrix.c
@@ -4,15 +4,12 @@
 /*
  * scan matrix
  */
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
+#include <string.h>
+#include "atomic_util.h"
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
 
 /* matrix state(1:on, 0:off) */
 extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
diff --git a/keyboards/gopolar/gg86/lib/logo.c b/keyboards/gopolar/gg86/lib/logo.c
index 3db3acdac10..8a8b97c4b7e 100644
--- a/keyboards/gopolar/gg86/lib/logo.c
+++ b/keyboards/gopolar/gg86/lib/logo.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "oled_driver.h"
+#include "progmem.h"
 
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
 
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json
deleted file mode 100644
index 6f3758c31a1..00000000000
--- a/keyboards/gummykey/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "keyboard_name": "GummyKey",
-    "manufacturer": "Gumorr",
-    "url": "https://github.com/gumorr/GummyKey",
-    "maintainer": "Gumorr",
-    "usb": {
-        "vid": "0xAA12",
-        "pid": "0x0001",
-        "device_version": "1.0.0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "diode_direction": "ROW2COL",
-    "layouts": {
-        "LAYOUT_split_4x6_5": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.25, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 0.25, "y": 1},
-                {"matrix": [5, 4], "x": 1.25, "y": 1},
-                {"matrix": [5, 3], "x": 2.25, "y": 1},
-                {"matrix": [5, 2], "x": 3.25, "y": 1},
-                {"matrix": [5, 1], "x": 4.25, "y": 1.125},
-                {"matrix": [5, 0], "x": 5.25, "y": 1.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 2},
-                {"matrix": [1, 2], "x": 2.25, "y": 2},
-                {"matrix": [1, 3], "x": 3.25, "y": 2},
-                {"matrix": [1, 4], "x": 4.25, "y": 2.125},
-                {"matrix": [1, 5], "x": 5.25, "y": 2.25},
-
-                {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [6, 4], "x": 1.25, "y": 3},
-                {"matrix": [6, 3], "x": 2.25, "y": 3},
-                {"matrix": [6, 2], "x": 3.25, "y": 3},
-                {"matrix": [6, 1], "x": 4.25, "y": 3.125},
-                {"matrix": [6, 0], "x": 5.25, "y": 3.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 4},
-                {"matrix": [2, 2], "x": 2.25, "y": 4},
-                {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25},
-                {"matrix": [2, 4], "x": 6.75, "y": 4.25},
-                {"matrix": [2, 5], "x": 13.25, "y": 0},
-
-                {"matrix": [7, 5], "x": 12.25, "y": 0},
-                {"matrix": [7, 4], "x": 11.25, "y": 0},
-                {"matrix": [7, 3], "x": 10.25, "y": 0},
-                {"matrix": [7, 2], "x": 9.25, "y": 0.125},
-                {"matrix": [7, 1], "x": 8.25, "y": 0.25},
-                {"matrix": [7, 0], "x": 13.25, "y": 1},
-
-                {"matrix": [3, 0], "x": 12.25, "y": 1},
-                {"matrix": [3, 1], "x": 11.25, "y": 1},
-                {"matrix": [3, 2], "x": 10.25, "y": 1},
-                {"matrix": [3, 3], "x": 9.25, "y": 1.125},
-                {"matrix": [3, 4], "x": 8.25, "y": 1.25},
-                {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25},
-
-                {"matrix": [8, 5], "x": 12.25, "y": 2},
-                {"matrix": [8, 4], "x": 11.25, "y": 2},
-                {"matrix": [8, 3], "x": 10.25, "y": 2},
-                {"matrix": [8, 2], "x": 9.25, "y": 2.125},
-                {"matrix": [8, 1], "x": 8.25, "y": 2.25},
-                {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25},
-
-                {"matrix": [4, 0], "x": 12.25, "y": 3},
-                {"matrix": [4, 1], "x": 11.25, "y": 3},
-                {"matrix": [4, 2], "x": 10.25, "y": 3},
-                {"matrix": [4, 4], "x": 9.25, "y": 3.125},
-                {"matrix": [4, 5], "x": 8.25, "y": 3.25},
-
-                {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 12.25, "y": 4},
-                {"matrix": [9, 2], "x": 11.25, "y": 4},
-                {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25},
-                {"matrix": [9, 0], "x": 7, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/gummykey/keyboard.json b/keyboards/gummykey/keyboard.json
new file mode 100644
index 00000000000..bb7001438df
--- /dev/null
+++ b/keyboards/gummykey/keyboard.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "GummyKey",
+    "manufacturer": "Gumorr",
+    "url": "https://github.com/gumorr/GummyKey",
+    "maintainer": "Gumorr",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "usb": {
+        "vid": "0xAA12",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "split": {
+        "enabled": true
+    },
+    "diode_direction": "ROW2COL",
+    "layouts": {
+        "LAYOUT_split_4x6_5": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 0.25, "y": 1},
+                {"matrix": [5, 4], "x": 1.25, "y": 1},
+                {"matrix": [5, 3], "x": 2.25, "y": 1},
+                {"matrix": [5, 2], "x": 3.25, "y": 1},
+                {"matrix": [5, 1], "x": 4.25, "y": 1.125},
+                {"matrix": [5, 0], "x": 5.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 2},
+                {"matrix": [1, 2], "x": 2.25, "y": 2},
+                {"matrix": [1, 3], "x": 3.25, "y": 2},
+                {"matrix": [1, 4], "x": 4.25, "y": 2.125},
+                {"matrix": [1, 5], "x": 5.25, "y": 2.25},
+
+                {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 3},
+                {"matrix": [6, 3], "x": 2.25, "y": 3},
+                {"matrix": [6, 2], "x": 3.25, "y": 3},
+                {"matrix": [6, 1], "x": 4.25, "y": 3.125},
+                {"matrix": [6, 0], "x": 5.25, "y": 3.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 4},
+                {"matrix": [2, 2], "x": 2.25, "y": 4},
+                {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25},
+                {"matrix": [2, 4], "x": 6.75, "y": 4.25},
+                {"matrix": [2, 5], "x": 13.25, "y": 0},
+
+                {"matrix": [7, 5], "x": 12.25, "y": 0},
+                {"matrix": [7, 4], "x": 11.25, "y": 0},
+                {"matrix": [7, 3], "x": 10.25, "y": 0},
+                {"matrix": [7, 2], "x": 9.25, "y": 0.125},
+                {"matrix": [7, 1], "x": 8.25, "y": 0.25},
+                {"matrix": [7, 0], "x": 13.25, "y": 1},
+
+                {"matrix": [3, 0], "x": 12.25, "y": 1},
+                {"matrix": [3, 1], "x": 11.25, "y": 1},
+                {"matrix": [3, 2], "x": 10.25, "y": 1},
+                {"matrix": [3, 3], "x": 9.25, "y": 1.125},
+                {"matrix": [3, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25},
+
+                {"matrix": [8, 5], "x": 12.25, "y": 2},
+                {"matrix": [8, 4], "x": 11.25, "y": 2},
+                {"matrix": [8, 3], "x": 10.25, "y": 2},
+                {"matrix": [8, 2], "x": 9.25, "y": 2.125},
+                {"matrix": [8, 1], "x": 8.25, "y": 2.25},
+                {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 12.25, "y": 3},
+                {"matrix": [4, 1], "x": 11.25, "y": 3},
+                {"matrix": [4, 2], "x": 10.25, "y": 3},
+                {"matrix": [4, 4], "x": 9.25, "y": 3.125},
+                {"matrix": [4, 5], "x": 8.25, "y": 3.25},
+
+                {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4},
+                {"matrix": [9, 2], "x": 11.25, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 7, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gummykey/rules.mk b/keyboards/gummykey/rules.mk
deleted file mode 100644
index b043543633b..00000000000
--- a/keyboards/gummykey/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index 0c9b4ddb0f4..225c5dcb37a 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -14,6 +14,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "rgblight": {
diff --git a/keyboards/halfcliff/matrix.c b/keyboards/halfcliff/matrix.c
index fd18fd27bda..99598dc1b78 100644
--- a/keyboards/halfcliff/matrix.c
+++ b/keyboards/halfcliff/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
-#include "util.h"
 #include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
+#include "atomic_util.h"
 #include "split_util.h"
-#include "config.h"
 #include "transport.h"
+#include "debounce.h"
+#include "wait.h"
 
 #define ERROR_DISCONNECT_COUNT 5
 
diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk
index 004db2a6d71..425015c04d8 100644
--- a/keyboards/halfcliff/rules.mk
+++ b/keyboards/halfcliff/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = no
 POINTING_DEVICE_ENABLE = no
 CUSTOM_MATRIX = yes
diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json
deleted file mode 100755
index 0dc55ed89ac..00000000000
--- a/keyboards/hand88/info.json
+++ /dev/null
@@ -1,564 +0,0 @@
-{
-    "keyboard_name": "Hand 88",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x3838",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
-        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": [
-        "tkl_f13_ansi_tsangan",
-        "tkl_f13_ansi_tsangan_split_bs_rshift",
-        "tkl_f13_iso_tsangan",
-        "tkl_f13_iso_tsangan_split_bs_rshift"
-    ],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hand88/keyboard.json b/keyboards/hand88/keyboard.json
new file mode 100755
index 00000000000..cb8a320aaf0
--- /dev/null
+++ b/keyboards/hand88/keyboard.json
@@ -0,0 +1,572 @@
+{
+    "keyboard_name": "Hand 88",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x3838",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": [
+        "tkl_f13_ansi_tsangan",
+        "tkl_f13_ansi_tsangan_split_bs_rshift",
+        "tkl_f13_iso_tsangan",
+        "tkl_f13_iso_tsangan_split_bs_rshift"
+    ],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk
deleted file mode 100644
index 475da662628..00000000000
--- a/keyboards/hand88/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
index 9c215a5e860..9b0164ed85e 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/info.json
@@ -15,6 +15,9 @@
     "mousekey": false,
     "nkro": false
   },
+  "split": {
+    "enabled": true
+  },
   "usb": {
     "vid": "0x6869",
     "pid": "0x0001",
diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk
index b4310ab72a6..4da205a168c 100644
--- a/keyboards/handwired/10k/rules.mk
+++ b/keyboards/handwired/10k/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c
index c9de095cf89..ea6018bfcce 100644
--- a/keyboards/handwired/atreus50/keymaps/default/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c
@@ -107,11 +107,6 @@ float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
         case QWERTY:
@@ -119,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_qwerty);
             #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
+            set_single_persistent_default_layer(_QWERTY);
           }
           return false;
           break;
@@ -128,7 +123,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_colemak);
             #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
+            set_single_persistent_default_layer(_COLEMAK);
           }
           return false;
           break;
@@ -137,7 +132,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_dvorak);
             #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
+            set_single_persistent_default_layer(_DVORAK);
           }
           return false;
           break;
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
deleted file mode 100644
index 910a628ca6a..00000000000
--- a/keyboards/handwired/brain/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "Brain",
-    "manufacturer": "Klackygears",
-    "url": "",
-    "maintainer": "Klackygears",
-    "usb": {
-        "vid": "0x4A53",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F4", "F5", "F6", "F7", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "bootmagic": {
-        "matrix": [0, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 28,
-        "split": true,
-        "max_brightness": 120
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "bootmagic": {
-            "matrix": [5, 0]
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 0.5},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-                {"matrix": [0, 5], "x": 5, "y": 0.75},
-                {"matrix": [0, 6], "x": 6, "y": 1},
-
-                {"matrix": [5, 0], "x": 8, "y": 1},
-                {"matrix": [5, 1], "x": 9, "y": 0.75},
-                {"matrix": [5, 2], "x": 10, "y": 0.5},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0.5},
-                {"matrix": [5, 5], "x": 13, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.25},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.75},
-                {"matrix": [1, 6], "x": 6, "y": 2},
-
-                {"matrix": [6, 0], "x": 8, "y": 2},
-                {"matrix": [6, 1], "x": 9, "y": 1.75},
-                {"matrix": [6, 2], "x": 10, "y": 1.5},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1.5},
-                {"matrix": [6, 5], "x": 13, "y": 2},
-                {"matrix": [6, 6], "x": 14, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.25},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-                {"matrix": [2, 5], "x": 5, "y": 2.75},
-                {"matrix": [2, 6], "x": 6, "y": 3},
-
-                {"matrix": [7, 0], "x": 8, "y": 3},
-                {"matrix": [7, 1], "x": 9, "y": 2.75},
-                {"matrix": [7, 2], "x": 10, "y": 2.5},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2.5},
-                {"matrix": [7, 5], "x": 13, "y": 3},
-                {"matrix": [7, 6], "x": 14, "y": 3.25},
-
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
-                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
-
-                {"matrix": [8, 1], "x": 8.5, "y": 4.25},
-                {"matrix": [8, 2], "x": 9.5, "y": 4.25},
-                {"matrix": [8, 3], "x": 10.5, "y": 4.25},
-                {"matrix": [8, 4], "x": 12, "y": 3.5},
-                {"matrix": [8, 5], "x": 13, "y": 4},
-
-                {"matrix": [4, 3], "x": 3.5, "y": 5.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 5.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 5.25},
-
-                {"matrix": [9, 1], "x": 8.5, "y": 5.25},
-                {"matrix": [9, 2], "x": 9.5, "y": 5.25},
-                {"matrix": [9, 3], "x": 10.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/brain/keyboard.json b/keyboards/handwired/brain/keyboard.json
new file mode 100644
index 00000000000..e9093711d00
--- /dev/null
+++ b/keyboards/handwired/brain/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "Brain",
+    "manufacturer": "Klackygears",
+    "url": "",
+    "maintainer": "Klackygears",
+    "usb": {
+        "vid": "0x4A53",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "bootmagic": {
+        "matrix": [0, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 28,
+        "split": true,
+        "max_brightness": 120
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "bootmagic": {
+            "matrix": [5, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.75},
+                {"matrix": [0, 6], "x": 6, "y": 1},
+
+                {"matrix": [5, 0], "x": 8, "y": 1},
+                {"matrix": [5, 1], "x": 9, "y": 0.75},
+                {"matrix": [5, 2], "x": 10, "y": 0.5},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.5},
+                {"matrix": [5, 5], "x": 13, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.75},
+                {"matrix": [1, 6], "x": 6, "y": 2},
+
+                {"matrix": [6, 0], "x": 8, "y": 2},
+                {"matrix": [6, 1], "x": 9, "y": 1.75},
+                {"matrix": [6, 2], "x": 10, "y": 1.5},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.5},
+                {"matrix": [6, 5], "x": 13, "y": 2},
+                {"matrix": [6, 6], "x": 14, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.75},
+                {"matrix": [2, 6], "x": 6, "y": 3},
+
+                {"matrix": [7, 0], "x": 8, "y": 3},
+                {"matrix": [7, 1], "x": 9, "y": 2.75},
+                {"matrix": [7, 2], "x": 10, "y": 2.5},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.5},
+                {"matrix": [7, 5], "x": 13, "y": 3},
+                {"matrix": [7, 6], "x": 14, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+
+                {"matrix": [8, 1], "x": 8.5, "y": 4.25},
+                {"matrix": [8, 2], "x": 9.5, "y": 4.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 12, "y": 3.5},
+                {"matrix": [8, 5], "x": 13, "y": 4},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 5.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.25},
+
+                {"matrix": [9, 1], "x": 8.5, "y": 5.25},
+                {"matrix": [9, 2], "x": 9.5, "y": 5.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk
deleted file mode 100644
index df7d719da16..00000000000
--- a/keyboards/handwired/brain/rules.mk
+++ /dev/null
@@ -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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
deleted file mode 100644
index 0bbdefe9216..00000000000
--- a/keyboards/handwired/chiron/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "keyboard_name": "Chiron",
-    "manufacturer": "Mike Hix",
-    "url": "",
-    "maintainer": "musl",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 4
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_chiron": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0},
-                {"matrix": [0, 5], "x": 1, "y": 0},
-                {"matrix": [0, 4], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [0, 1], "x": 5, "y": 0},
-                {"matrix": [0, 0], "x": 6, "y": 0},
-
-                {"matrix": [5, 6], "x": 8, "y": 0},
-                {"matrix": [5, 5], "x": 9, "y": 0},
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "x": 14, "y": 0},
-
-                {"matrix": [1, 6], "x": 0, "y": 1},
-                {"matrix": [1, 5], "x": 1, "y": 1},
-                {"matrix": [1, 4], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 1], "x": 5, "y": 1},
-                {"matrix": [1, 0], "x": 6, "y": 1},
-
-                {"matrix": [6, 6], "x": 8, "y": 1},
-                {"matrix": [6, 5], "x": 9, "y": 1},
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "x": 14, "y": 1},
-
-                {"matrix": [2, 6], "x": 0, "y": 2},
-                {"matrix": [2, 5], "x": 1, "y": 2},
-                {"matrix": [2, 4], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [2, 1], "x": 5, "y": 2},
-                {"matrix": [2, 0], "x": 6, "y": 2},
-
-                {"matrix": [7, 6], "x": 8, "y": 2},
-                {"matrix": [7, 5], "x": 9, "y": 2},
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
-
-                {"matrix": [3, 6], "x": 0, "y": 3},
-                {"matrix": [3, 5], "x": 1, "y": 3},
-                {"matrix": [3, 4], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 1], "x": 5, "y": 3},
-                {"matrix": [3, 0], "x": 6, "y": 3},
-
-                {"matrix": [8, 6], "x": 8, "y": 3},
-                {"matrix": [8, 5], "x": 9, "y": 3},
-                {"matrix": [8, 4], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
-                {"matrix": [8, 0], "x": 14, "y": 3},
-
-                {"matrix": [4, 6], "x": 0, "y": 4},
-                {"matrix": [4, 5], "x": 1, "y": 4},
-                {"matrix": [4, 4], "x": 2, "y": 4},
-                {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
-                {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
-                {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
-
-                {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
-                {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
-                {"matrix": [9, 2], "x": 12, "y": 4},
-                {"matrix": [9, 1], "x": 13, "y": 4},
-                {"matrix": [9, 0], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/chiron/keyboard.json b/keyboards/handwired/chiron/keyboard.json
new file mode 100644
index 00000000000..6c2626df64b
--- /dev/null
+++ b/keyboards/handwired/chiron/keyboard.json
@@ -0,0 +1,128 @@
+{
+    "keyboard_name": "Chiron",
+    "manufacturer": "Mike Hix",
+    "url": "",
+    "maintainer": "musl",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 4
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_chiron": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+                {"matrix": [0, 5], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 1], "x": 5, "y": 0},
+                {"matrix": [0, 0], "x": 6, "y": 0},
+
+                {"matrix": [5, 6], "x": 8, "y": 0},
+                {"matrix": [5, 5], "x": 9, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "x": 14, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 5], "x": 1, "y": 1},
+                {"matrix": [1, 4], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 1], "x": 5, "y": 1},
+                {"matrix": [1, 0], "x": 6, "y": 1},
+
+                {"matrix": [6, 6], "x": 8, "y": 1},
+                {"matrix": [6, 5], "x": 9, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "x": 14, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 5], "x": 1, "y": 2},
+                {"matrix": [2, 4], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 1], "x": 5, "y": 2},
+                {"matrix": [2, 0], "x": 6, "y": 2},
+
+                {"matrix": [7, 6], "x": 8, "y": 2},
+                {"matrix": [7, 5], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3},
+                {"matrix": [3, 5], "x": 1, "y": 3},
+                {"matrix": [3, 4], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 1], "x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 6, "y": 3},
+
+                {"matrix": [8, 6], "x": 8, "y": 3},
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3},
+
+                {"matrix": [4, 6], "x": 0, "y": 4},
+                {"matrix": [4, 5], "x": 1, "y": 4},
+                {"matrix": [4, 4], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
+                {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
+                {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
+
+                {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
+                {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 1], "x": 13, "y": 4},
+                {"matrix": [9, 0], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk
deleted file mode 100644
index 9ca8ab3ebc9..00000000000
--- a/keyboards/handwired/chiron/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-AUDIO_ENABLE = no
-AUTOLOG_ENABLE = no
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE = no
-CONSOLE_ENABLE = no
-DEBUG_ENABLE = no
-EXTRAKEY_ENABLE = no
-LEADER_ENABLE = no
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = no            # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/keyboard.json
similarity index 100%
rename from keyboards/handwired/ck4x4/info.json
rename to keyboards/handwired/ck4x4/keyboard.json
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
deleted file mode 100644
index 216aa810fd3..00000000000
--- a/keyboards/handwired/ck4x4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = handwired/ck4x4
diff --git a/keyboards/handwired/d48/taphold.c b/keyboards/handwired/d48/taphold.c
index 0b56a5a6a10..5360391b970 100644
--- a/keyboards/handwired/d48/taphold.c
+++ b/keyboards/handwired/d48/taphold.c
@@ -1,4 +1,7 @@
 #include "taphold.h"
+#include "action_layer.h"
+#include "keyboard.h"
+#include "timer.h"
 
 bool taphold_process(uint16_t keycode, keyrecord_t *record) {
     for (int i = 0; i < taphold_config_size; i++) {
diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h
index 2a691aa63f6..8788c58f3d9 100644
--- a/keyboards/handwired/d48/taphold.h
+++ b/keyboards/handwired/d48/taphold.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 typedef enum taphold_mode_t {
     TAPHOLD_LAYER,
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
deleted file mode 100644
index 141bb477177..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "keyboard_name": "Dactyl Manuform 4x5",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3435",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
-    "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": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "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": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "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": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
-
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
-
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 3], "x": 11, "y": 4},
-
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 3], "x": 6, "y": 5},
-
-                {"matrix": [9, 3], "x": 8, "y": 5},
-                {"matrix": [9, 4], "x": 9, "y": 5},
-
-                {"matrix": [4, 2], "x": 5, "y": 6},
-                {"matrix": [4, 1], "x": 6, "y": 6},
-
-                {"matrix": [9, 1], "x": 8, "y": 6},
-                {"matrix": [9, 2], "x": 9, "y": 6}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "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": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "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": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "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": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
-
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 3], "x": 11, "y": 4},
-
-                {"matrix": [4, 4], "x": 5, "y": 5},
-
-                {"matrix": [9, 4], "x": 9, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
new file mode 100644
index 00000000000..b779e9d3c1e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
@@ -0,0 +1,151 @@
+{
+    "keyboard_name": "Dactyl Manuform 4x5",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3435",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["split_3x5_3"],
+    "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": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "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": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "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": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 3], "x": 11, "y": 4},
+
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 3], "x": 6, "y": 5},
+
+                {"matrix": [9, 3], "x": 8, "y": 5},
+                {"matrix": [9, 4], "x": 9, "y": 5},
+
+                {"matrix": [4, 2], "x": 5, "y": 6},
+                {"matrix": [4, 1], "x": 6, "y": 6},
+
+                {"matrix": [9, 1], "x": 8, "y": 6},
+                {"matrix": [9, 2], "x": 9, "y": 6}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "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": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 0], "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": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 0], "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": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+
+                {"matrix": [8, 4], "x": 10, "y": 4},
+                {"matrix": [8, 3], "x": 11, "y": 4},
+
+                {"matrix": [4, 4], "x": 5, "y": 5},
+
+                {"matrix": [9, 4], "x": 9, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
index 375c2082444..630b106ca77 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
@@ -130,8 +130,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______, _______,  _______, _______
     )
 };
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index bc309f5a783..d0136c4c51d 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -119,9 +119,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                              ____, ____,  ____, ____
 )
 };
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
deleted file mode 100644
index 76f13971d45..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "Dactyl ManuForm 4x5_5",
-    "manufacturer": "ssedrick",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
-    "maintainer": "ssedrick",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3435",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "F6"],
-        "rows": ["F7", "B1", "B3", "B2", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "development_board": "promicro",
-    "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": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "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": [6, 0], "x": 8, "y": 1},
-                {"matrix": [6, 1], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "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": [7, 0], "x": 8, "y": 2},
-                {"matrix": [7, 1], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-
-                {"matrix": [8, 1], "x": 9, "y": 4},
-                {"matrix": [9, 0], "x": 7, "y": 4},
-                {"matrix": [8, 0], "x": 8, "y": 4},
-
-                {"matrix": [4, 2], "x": 4, "y": 5},
-                {"matrix": [4, 3], "x": 5, "y": 5},
-
-                {"matrix": [9, 1], "x": 7, "y": 5},
-                {"matrix": [9, 2], "x": 8, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
new file mode 100644
index 00000000000..8f53dd03039
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "Dactyl ManuForm 4x5_5",
+    "manufacturer": "ssedrick",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
+    "maintainer": "ssedrick",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3435",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "F6"],
+        "rows": ["F7", "B1", "B3", "B2", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "development_board": "promicro",
+    "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": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "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": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "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": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+
+                {"matrix": [8, 1], "x": 9, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [8, 0], "x": 8, "y": 4},
+
+                {"matrix": [4, 2], "x": 4, "y": 5},
+                {"matrix": [4, 3], "x": 5, "y": 5},
+
+                {"matrix": [9, 1], "x": 7, "y": 5},
+                {"matrix": [9, 2], "x": 8, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
deleted file mode 100644
index 4240679233b..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-
-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 = yes        # 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
deleted file mode 100644
index 5b415fbd2bb..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "Dactyl Manuform 4x6",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3436",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [3, 5], "x": 5, "y": 4},
-
-                {"matrix": [8, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4},
-
-                {"matrix": [4, 4], "x": 6, "y": 5},
-                {"matrix": [4, 5], "x": 7, "y": 5},
-
-                {"matrix": [9, 0], "x": 9, "y": 5},
-                {"matrix": [9, 1], "x": 10, "y": 5},
-
-                {"matrix": [4, 2], "x": 6, "y": 6},
-                {"matrix": [4, 3], "x": 7, "y": 6},
-
-                {"matrix": [9, 2], "x": 9, "y": 6},
-                {"matrix": [9, 3], "x": 10, "y": 6}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
new file mode 100644
index 00000000000..feb58db5dbe
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Dactyl Manuform 4x6",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3436",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "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": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 15, "y": 1},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 4], "x": 15, "y": 2},
+                {"matrix": [7, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+
+                {"matrix": [8, 0], "x": 11, "y": 4},
+                {"matrix": [8, 1], "x": 12, "y": 4},
+
+                {"matrix": [4, 4], "x": 6, "y": 5},
+                {"matrix": [4, 5], "x": 7, "y": 5},
+
+                {"matrix": [9, 0], "x": 9, "y": 5},
+                {"matrix": [9, 1], "x": 10, "y": 5},
+
+                {"matrix": [4, 2], "x": 6, "y": 6},
+                {"matrix": [4, 3], "x": 7, "y": 6},
+
+                {"matrix": [9, 2], "x": 9, "y": 6},
+                {"matrix": [9, 3], "x": 10, "y": 6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
index b447b5c18c3..e218c65d426 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
@@ -70,8 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                             _______, _______,             _______, _______
     )
 };
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
deleted file mode 100644
index f54f0d56d25..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-    "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3436",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x6_3", "split_3x5_3"],
-    "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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 3], "x": 6, "y": 4},
-
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4},
-
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 2], "x": 6, "y": 5},
-
-                {"matrix": [9, 3], "x": 10, "y": 5},
-                {"matrix": [9, 1], "x": 11, "y": 5}
-            ]
-        },
-        "LAYOUT_split_3x6_3": {
-            "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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 3], "x": 6, "y": 4},
-
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1, "y": 0},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 5], "x": 4, "y": 0},
-
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1},
-                {"matrix": [1, 2], "x": 1, "y": 1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1},
-                {"matrix": [1, 5], "x": 4, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2},
-                {"matrix": [2, 5], "x": 4, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [4, 5], "x": 5, "y": 3},
-                {"matrix": [4, 3], "x": 6, "y": 3},
-
-                {"matrix": [9, 2], "x": 8, "y": 3},
-                {"matrix": [9, 0], "x": 9, "y": 3},
-                {"matrix": [8, 1], "x": 10, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
new file mode 100644
index 00000000000..a0607c70683
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
@@ -0,0 +1,204 @@
+{
+    "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3436",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["split_3x6_3", "split_3x5_3"],
+    "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": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 15, "y": 1},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 4], "x": 15, "y": 2},
+                {"matrix": [7, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 3], "x": 6, "y": 4},
+
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 0], "x": 11, "y": 4},
+                {"matrix": [8, 1], "x": 12, "y": 4},
+
+                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 2], "x": 6, "y": 5},
+
+                {"matrix": [9, 3], "x": 10, "y": 5},
+                {"matrix": [9, 1], "x": 11, "y": 5}
+            ]
+        },
+        "LAYOUT_split_3x6_3": {
+            "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": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 15, "y": 0},
+                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+                {"matrix": [6, 1], "x": 12, "y": 1},
+                {"matrix": [6, 2], "x": 13, "y": 1},
+                {"matrix": [6, 3], "x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 15, "y": 1},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+                {"matrix": [7, 1], "x": 12, "y": 2},
+                {"matrix": [7, 2], "x": 13, "y": 2},
+                {"matrix": [7, 3], "x": 14, "y": 2},
+                {"matrix": [7, 4], "x": 15, "y": 2},
+                {"matrix": [7, 5], "x": 16, "y": 2},
+
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 3], "x": 6, "y": 4},
+
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 0], "x": 11, "y": 4},
+                {"matrix": [8, 1], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 1], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 5], "x": 4, "y": 0},
+
+                {"matrix": [5, 0], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 4], "x": 14, "y": 0},
+
+                {"matrix": [1, 1], "x": 0, "y": 1},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 5], "x": 4, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 5], "x": 4, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [4, 5], "x": 5, "y": 3},
+                {"matrix": [4, 3], "x": 6, "y": 3},
+
+                {"matrix": [9, 2], "x": 8, "y": 3},
+                {"matrix": [9, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
deleted file mode 100644
index e6372961d8f..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x6": {
-            "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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-
-                {"matrix": [4, 4], "x": 4, "y": 5},
-                {"matrix": [4, 5], "x": 5, "y": 5},
-
-                {"matrix": [10, 0], "x": 11, "y": 5},
-                {"matrix": [10, 1], "x": 12, "y": 5},
-
-                {"matrix": [5, 4], "x": 6, "y": 6},
-                {"matrix": [5, 5], "x": 7, "y": 6},
-
-                {"matrix": [11, 0], "x": 9, "y": 6},
-                {"matrix": [11, 1], "x": 10, "y": 6},
-
-                {"matrix": [5, 2], "x": 6, "y": 7},
-                {"matrix": [5, 3], "x": 7, "y": 7},
-
-                {"matrix": [11, 2], "x": 9, "y": 7},
-                {"matrix": [11, 3], "x": 10, "y": 7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
new file mode 100644
index 00000000000..b5681f4ca7e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Dactyl-Manuform (5x6)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_5x6": {
+            "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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4},
+
+                {"matrix": [4, 4], "x": 4, "y": 5},
+                {"matrix": [4, 5], "x": 5, "y": 5},
+
+                {"matrix": [10, 0], "x": 11, "y": 5},
+                {"matrix": [10, 1], "x": 12, "y": 5},
+
+                {"matrix": [5, 4], "x": 6, "y": 6},
+                {"matrix": [5, 5], "x": 7, "y": 6},
+
+                {"matrix": [11, 0], "x": 9, "y": 6},
+                {"matrix": [11, 1], "x": 10, "y": 6},
+
+                {"matrix": [5, 2], "x": 6, "y": 7},
+                {"matrix": [5, 3], "x": 7, "y": 7},
+
+                {"matrix": [11, 2], "x": 9, "y": 7},
+                {"matrix": [11, 3], "x": 10, "y": 7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
deleted file mode 100644
index e9aba3fa180..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6+2)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "jceb",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "bootmagic": {
-            "matrix": [6, 5]
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x6_2_5": {
-            "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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "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": 5, "y": 4},
-                {"matrix": [5, 5], "x": 6, "y": 4},
-                {"matrix": [5, 3], "x": 7, "y": 4},
-
-                {"matrix": [11, 2], "x": 9, "y": 4},
-                {"matrix": [11, 0], "x": 10, "y": 4},
-                {"matrix": [10, 1], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-                {"matrix": [10, 4], "x": 15, "y": 4},
-                {"matrix": [10, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 4], "x": 6, "y": 5},
-                {"matrix": [5, 2], "x": 7, "y": 5},
-
-                {"matrix": [11, 3], "x": 9, "y": 5},
-                {"matrix": [11, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
new file mode 100644
index 00000000000..e36acea627c
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Dactyl-Manuform (5x6+2)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "jceb",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_5x6_2_5": {
+            "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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "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": 5, "y": 4},
+                {"matrix": [5, 5], "x": 6, "y": 4},
+                {"matrix": [5, 3], "x": 7, "y": 4},
+
+                {"matrix": [11, 2], "x": 9, "y": 4},
+                {"matrix": [11, 0], "x": 10, "y": 4},
+                {"matrix": [10, 1], "x": 11, "y": 4},
+                {"matrix": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4},
+                {"matrix": [10, 4], "x": 15, "y": 4},
+                {"matrix": [10, 5], "x": 16, "y": 4},
+
+                {"matrix": [5, 4], "x": 6, "y": 5},
+                {"matrix": [5, 2], "x": 7, "y": 5},
+
+                {"matrix": [11, 3], "x": 9, "y": 5},
+                {"matrix": [11, 1], "x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
deleted file mode 100644
index 04b1fc01b7f..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
deleted file mode 100644
index e60286d1664..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "jceb",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "bootmagic": {
-            "matrix": [6, 5]
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x6_5": {
-            "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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-                {"matrix": [5, 5], "x": 6, "y": 4},
-                {"matrix": [5, 3], "x": 7, "y": 4},
-
-                {"matrix": [11, 2], "x": 9, "y": 4},
-                {"matrix": [11, 0], "x": 10, "y": 4},
-                {"matrix": [10, 1], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-
-                {"matrix": [5, 4], "x": 6, "y": 5},
-                {"matrix": [5, 2], "x": 7, "y": 5},
-
-                {"matrix": [11, 3], "x": 9, "y": 5},
-                {"matrix": [11, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
new file mode 100644
index 00000000000..1153bcdb44e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
@@ -0,0 +1,112 @@
+{
+    "keyboard_name": "Dactyl-Manuform (5x6)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "jceb",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_5x6_5": {
+            "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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [5, 5], "x": 6, "y": 4},
+                {"matrix": [5, 3], "x": 7, "y": 4},
+
+                {"matrix": [11, 2], "x": 9, "y": 4},
+                {"matrix": [11, 0], "x": 10, "y": 4},
+                {"matrix": [10, 1], "x": 11, "y": 4},
+                {"matrix": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4},
+
+                {"matrix": [5, 4], "x": 6, "y": 5},
+                {"matrix": [5, 2], "x": 7, "y": 5},
+
+                {"matrix": [11, 3], "x": 9, "y": 5},
+                {"matrix": [11, 1], "x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
deleted file mode 100644
index c397f50ab5c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
+++ /dev/null
@@ -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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
deleted file mode 100644
index a00a3bda18d..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "manufacturer": "QMK",
-    "keyboard_name": "Dactyl Manuform 5x6+6",
-    "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
-    "maintainer": "fgoodwin",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_split_5x6_6": {
-            "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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-                {"matrix": [4, 5], "x": 6, "y": 4},
-
-                {"matrix": [11, 0], "x": 7, "y": 4},
-                {"matrix": [11, 1], "x": 9, "y": 4},
-                {"matrix": [11, 2], "x": 10, "y": 4},
-                {"matrix": [11, 3], "x": 11, "y": 4},
-
-                {"matrix": [5, 4], "x": 13, "y": 4},
-                {"matrix": [5, 5], "x": 14, "y": 4},
-
-                {"matrix": [12, 0], "x": 5, "y": 5},
-                {"matrix": [12, 1], "x": 6, "y": 5},
-
-                {"matrix": [6, 4], "x": 7, "y": 5},
-                {"matrix": [6, 5], "x": 5, "y": 5},
-
-                {"matrix": [13, 0], "x": 9, "y": 5},
-                {"matrix": [13, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
new file mode 100644
index 00000000000..8a3e69f2efb
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
@@ -0,0 +1,113 @@
+{
+    "manufacturer": "QMK",
+    "keyboard_name": "Dactyl Manuform 5x6+6",
+    "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
+    "maintainer": "fgoodwin",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3536",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_split_5x6_6": {
+            "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": [7, 0], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [7, 3], "x": 14, "y": 0},
+                {"matrix": [7, 4], "x": 15, "y": 0},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+                {"matrix": [8, 1], "x": 12, "y": 1},
+                {"matrix": [8, 2], "x": 13, "y": 1},
+                {"matrix": [8, 3], "x": 14, "y": 1},
+                {"matrix": [8, 4], "x": 15, "y": 1},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+                {"matrix": [9, 1], "x": 12, "y": 2},
+                {"matrix": [9, 2], "x": 13, "y": 2},
+                {"matrix": [9, 3], "x": 14, "y": 2},
+                {"matrix": [9, 4], "x": 15, "y": 2},
+                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+                {"matrix": [10, 1], "x": 12, "y": 3},
+                {"matrix": [10, 2], "x": 13, "y": 3},
+                {"matrix": [10, 3], "x": 14, "y": 3},
+                {"matrix": [10, 4], "x": 15, "y": 3},
+                {"matrix": [10, 5], "x": 16, "y": 3},
+
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+
+                {"matrix": [11, 0], "x": 7, "y": 4},
+                {"matrix": [11, 1], "x": 9, "y": 4},
+                {"matrix": [11, 2], "x": 10, "y": 4},
+                {"matrix": [11, 3], "x": 11, "y": 4},
+
+                {"matrix": [5, 4], "x": 13, "y": 4},
+                {"matrix": [5, 5], "x": 14, "y": 4},
+
+                {"matrix": [12, 0], "x": 5, "y": 5},
+                {"matrix": [12, 1], "x": 6, "y": 5},
+
+                {"matrix": [6, 4], "x": 7, "y": 5},
+                {"matrix": [6, 5], "x": 5, "y": 5},
+
+                {"matrix": [13, 0], "x": 9, "y": 5},
+                {"matrix": [13, 1], "x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
deleted file mode 100644
index 59ada7958fa..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
+++ /dev/null
@@ -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 = yes        # 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
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
deleted file mode 100644
index 68270606cc4..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x7)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3537",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x7": {
-            "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": [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": [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": [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": [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": 5},
-                {"matrix": [4, 5], "x": 5, "y": 5},
-
-                {"matrix": [5, 4], "x": 6, "y": 6},
-                {"matrix": [5, 5], "x": 7, "y": 6},
-
-                {"matrix": [5, 2], "x": 6, "y": 7},
-                {"matrix": [5, 3], "x": 7, "y": 7},
-
-                {"matrix": [6, 0], "x": 10, "y": 0},
-                {"matrix": [6, 1], "x": 11, "y": 0},
-                {"matrix": [6, 2], "x": 12, "y": 0},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0},
-                {"matrix": [6, 5], "x": 15, "y": 0},
-                {"matrix": [6, 6], "x": 16, "y": 0},
-
-                {"matrix": [7, 0], "x": 10, "y": 1},
-                {"matrix": [7, 1], "x": 11, "y": 1},
-                {"matrix": [7, 2], "x": 12, "y": 1},
-                {"matrix": [7, 3], "x": 13, "y": 1},
-                {"matrix": [7, 4], "x": 14, "y": 1},
-                {"matrix": [7, 5], "x": 15, "y": 1},
-                {"matrix": [7, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 0], "x": 10, "y": 2},
-                {"matrix": [8, 1], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2},
-                {"matrix": [8, 5], "x": 15, "y": 2},
-                {"matrix": [8, 6], "x": 16, "y": 2},
-
-                {"matrix": [9, 1], "x": 11, "y": 3},
-                {"matrix": [9, 2], "x": 12, "y": 3},
-                {"matrix": [9, 3], "x": 13, "y": 3},
-                {"matrix": [9, 4], "x": 14, "y": 3},
-                {"matrix": [9, 5], "x": 15, "y": 3},
-                {"matrix": [9, 6], "x": 16, "y": 3},
-
-                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 4], "x": 14, "y": 4},
-                {"matrix": [10, 5], "x": 15, "y": 4},
-                {"matrix": [10, 6], "x": 16, "y": 4},
-
-                {"matrix": [10, 1], "x": 11, "y": 5},
-                {"matrix": [10, 2], "x": 12, "y": 5},
-
-                {"matrix": [11, 1], "x": 9, "y": 6},
-                {"matrix": [11, 2], "x": 10, "y": 6},
-
-                {"matrix": [11, 3], "x": 9, "y": 7},
-                {"matrix": [11, 4], "x": 10, "y": 7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
new file mode 100644
index 00000000000..bc734607cf3
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Dactyl-Manuform (5x7)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3537",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_5x7": {
+            "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": [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": [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": [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": [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": 5},
+                {"matrix": [4, 5], "x": 5, "y": 5},
+
+                {"matrix": [5, 4], "x": 6, "y": 6},
+                {"matrix": [5, 5], "x": 7, "y": 6},
+
+                {"matrix": [5, 2], "x": 6, "y": 7},
+                {"matrix": [5, 3], "x": 7, "y": 7},
+
+                {"matrix": [6, 0], "x": 10, "y": 0},
+                {"matrix": [6, 1], "x": 11, "y": 0},
+                {"matrix": [6, 2], "x": 12, "y": 0},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0},
+                {"matrix": [6, 5], "x": 15, "y": 0},
+                {"matrix": [6, 6], "x": 16, "y": 0},
+
+                {"matrix": [7, 0], "x": 10, "y": 1},
+                {"matrix": [7, 1], "x": 11, "y": 1},
+                {"matrix": [7, 2], "x": 12, "y": 1},
+                {"matrix": [7, 3], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1},
+                {"matrix": [7, 5], "x": 15, "y": 1},
+                {"matrix": [7, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 0], "x": 10, "y": 2},
+                {"matrix": [8, 1], "x": 11, "y": 2},
+                {"matrix": [8, 2], "x": 12, "y": 2},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2},
+                {"matrix": [8, 5], "x": 15, "y": 2},
+                {"matrix": [8, 6], "x": 16, "y": 2},
+
+                {"matrix": [9, 1], "x": 11, "y": 3},
+                {"matrix": [9, 2], "x": 12, "y": 3},
+                {"matrix": [9, 3], "x": 13, "y": 3},
+                {"matrix": [9, 4], "x": 14, "y": 3},
+                {"matrix": [9, 5], "x": 15, "y": 3},
+                {"matrix": [9, 6], "x": 16, "y": 3},
+
+                {"matrix": [10, 3], "x": 13, "y": 4},
+                {"matrix": [10, 4], "x": 14, "y": 4},
+                {"matrix": [10, 5], "x": 15, "y": 4},
+                {"matrix": [10, 6], "x": 16, "y": 4},
+
+                {"matrix": [10, 1], "x": 11, "y": 5},
+                {"matrix": [10, 2], "x": 12, "y": 5},
+
+                {"matrix": [11, 1], "x": 9, "y": 6},
+                {"matrix": [11, 2], "x": 10, "y": 6},
+
+                {"matrix": [11, 3], "x": 9, "y": 7},
+                {"matrix": [11, 4], "x": 10, "y": 7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
index 0295176c259..905ed5cc3fe 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -5,6 +5,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "bootmagic": {
             "matrix": [7, 0]
         }
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
index 9be91100437..c6228f59ed7 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -11,11 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-
-# Build Options
-#   change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
 # split settings
 # https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
index 245310fd3c5..e9b1152d664 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -5,6 +5,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 84645084d3a..389d7509f00 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
deleted file mode 100644
index 955060de7a0..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (6x6+4)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "dmik",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3636",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_6x6_4": {
-            "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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4},
-                {"matrix": [11, 1], "x": 12, "y": 4},
-                {"matrix": [11, 2], "x": 13, "y": 4},
-                {"matrix": [11, 3], "x": 14, "y": 4},
-                {"matrix": [11, 4], "x": 15, "y": 4},
-                {"matrix": [11, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-
-                {"matrix": [12, 2], "x": 13, "y": 5},
-                {"matrix": [12, 3], "x": 14, "y": 5},
-                {"matrix": [12, 4], "x": 15, "y": 5},
-                {"matrix": [12, 5], "x": 16, "y": 5},
-
-                {"matrix": [5, 4], "x": 4, "y": 6},
-                {"matrix": [5, 5], "x": 5, "y": 6},
-
-                {"matrix": [12, 0], "x": 11, "y": 6},
-                {"matrix": [12, 1], "x": 12, "y": 6},
-
-                {"matrix": [6, 4], "x": 6, "y": 7},
-                {"matrix": [6, 5], "x": 7, "y": 7},
-
-                {"matrix": [13, 0], "x": 9, "y": 7},
-                {"matrix": [13, 1], "x": 10, "y": 7},
-
-                {"matrix": [6, 2], "x": 6, "y": 8},
-                {"matrix": [6, 3], "x": 7, "y": 8},
-
-                {"matrix": [13, 2], "x": 9, "y": 8},
-                {"matrix": [13, 3], "x": 10, "y": 8}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
new file mode 100644
index 00000000000..36051fb7feb
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
@@ -0,0 +1,139 @@
+{
+    "keyboard_name": "Dactyl-Manuform (6x6+4)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "dmik",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x3636",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_6x6_4": {
+            "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": [7, 0], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [7, 3], "x": 14, "y": 0},
+                {"matrix": [7, 4], "x": 15, "y": 0},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+                {"matrix": [8, 1], "x": 12, "y": 1},
+                {"matrix": [8, 2], "x": 13, "y": 1},
+                {"matrix": [8, 3], "x": 14, "y": 1},
+                {"matrix": [8, 4], "x": 15, "y": 1},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+                {"matrix": [9, 1], "x": 12, "y": 2},
+                {"matrix": [9, 2], "x": 13, "y": 2},
+                {"matrix": [9, 3], "x": 14, "y": 2},
+                {"matrix": [9, 4], "x": 15, "y": 2},
+                {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+                {"matrix": [10, 1], "x": 12, "y": 3},
+                {"matrix": [10, 2], "x": 13, "y": 3},
+                {"matrix": [10, 3], "x": 14, "y": 3},
+                {"matrix": [10, 4], "x": 15, "y": 3},
+                {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4},
+                {"matrix": [11, 1], "x": 12, "y": 4},
+                {"matrix": [11, 2], "x": 13, "y": 4},
+                {"matrix": [11, 3], "x": 14, "y": 4},
+                {"matrix": [11, 4], "x": 15, "y": 4},
+                {"matrix": [11, 5], "x": 16, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+
+                {"matrix": [12, 2], "x": 13, "y": 5},
+                {"matrix": [12, 3], "x": 14, "y": 5},
+                {"matrix": [12, 4], "x": 15, "y": 5},
+                {"matrix": [12, 5], "x": 16, "y": 5},
+
+                {"matrix": [5, 4], "x": 4, "y": 6},
+                {"matrix": [5, 5], "x": 5, "y": 6},
+
+                {"matrix": [12, 0], "x": 11, "y": 6},
+                {"matrix": [12, 1], "x": 12, "y": 6},
+
+                {"matrix": [6, 4], "x": 6, "y": 7},
+                {"matrix": [6, 5], "x": 7, "y": 7},
+
+                {"matrix": [13, 0], "x": 9, "y": 7},
+                {"matrix": [13, 1], "x": 10, "y": 7},
+
+                {"matrix": [6, 2], "x": 6, "y": 8},
+                {"matrix": [6, 3], "x": 7, "y": 8},
+
+                {"matrix": [13, 2], "x": 9, "y": 8},
+                {"matrix": [13, 3], "x": 10, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_minidox/3x5_3.c b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c
similarity index 100%
rename from keyboards/handwired/dactyl_minidox/3x5_3.c
rename to keyboards/handwired/dactyl_minidox/dactyl_minidox.c
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
deleted file mode 100644
index 2ae20d2f4a8..00000000000
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "Dactyl Ergo(6x6)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_6x6": {
-            "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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "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": 6, "h": 2},
-
-                {"matrix": [10, 0], "x": 11, "y": 6, "h": 2},
-                {"matrix": [10, 1], "x": 12, "y": 4},
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-                {"matrix": [10, 4], "x": 15, "y": 4},
-                {"matrix": [10, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 5], "x": 6, "y": 6, "h": 2},
-                {"matrix": [5, 1], "x": 6, "y": 5},
-                {"matrix": [5, 2], "x": 7, "y": 5},
-
-                {"matrix": [11, 3], "x": 9, "y": 5},
-                {"matrix": [11, 4], "x": 10, "y": 5},
-                {"matrix": [11, 0], "x": 10, "y": 6, "h": 2},
-
-                {"matrix": [5, 3], "x": 7, "y": 6},
-                {"matrix": [11, 2], "x": 9, "y": 6},
-
-                {"matrix": [5, 4], "x": 7, "y": 7},
-                {"matrix": [11, 1], "x": 9, "y": 7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/dactyl_promicro/keyboard.json b/keyboards/handwired/dactyl_promicro/keyboard.json
new file mode 100644
index 00000000000..572ea05b2f3
--- /dev/null
+++ b/keyboards/handwired/dactyl_promicro/keyboard.json
@@ -0,0 +1,125 @@
+{
+    "keyboard_name": "Dactyl Ergo(6x6)",
+    "manufacturer": "tshort",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_6x6": {
+            "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": [6, 0], "x": 11, "y": 0},
+                {"matrix": [6, 1], "x": 12, "y": 0},
+                {"matrix": [6, 2], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+                {"matrix": [6, 4], "x": 15, "y": 0},
+                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+                {"matrix": [7, 3], "x": 14, "y": 1},
+                {"matrix": [7, 4], "x": 15, "y": 1},
+                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+                {"matrix": [8, 1], "x": 12, "y": 2},
+                {"matrix": [8, 2], "x": 13, "y": 2},
+                {"matrix": [8, 3], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 15, "y": 2},
+                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+                {"matrix": [9, 1], "x": 12, "y": 3},
+                {"matrix": [9, 2], "x": 13, "y": 3},
+                {"matrix": [9, 3], "x": 14, "y": 3},
+                {"matrix": [9, 4], "x": 15, "y": 3},
+                {"matrix": [9, 5], "x": 16, "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": 6, "h": 2},
+
+                {"matrix": [10, 0], "x": 11, "y": 6, "h": 2},
+                {"matrix": [10, 1], "x": 12, "y": 4},
+                {"matrix": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4},
+                {"matrix": [10, 4], "x": 15, "y": 4},
+                {"matrix": [10, 5], "x": 16, "y": 4},
+
+                {"matrix": [5, 5], "x": 6, "y": 6, "h": 2},
+                {"matrix": [5, 1], "x": 6, "y": 5},
+                {"matrix": [5, 2], "x": 7, "y": 5},
+
+                {"matrix": [11, 3], "x": 9, "y": 5},
+                {"matrix": [11, 4], "x": 10, "y": 5},
+                {"matrix": [11, 0], "x": 10, "y": 6, "h": 2},
+
+                {"matrix": [5, 3], "x": 7, "y": 6},
+                {"matrix": [11, 2], "x": 9, "y": 6},
+
+                {"matrix": [5, 4], "x": 7, "y": 7},
+                {"matrix": [11, 1], "x": 9, "y": 7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk
deleted file mode 100644
index d3768185db4..00000000000
--- a/keyboards/handwired/dactyl_promicro/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
deleted file mode 100644
index bfacb99a4b0..00000000000
--- a/keyboards/handwired/dactyl_rah/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "keyboard_name": "Dactyl RAH",
-  "manufacturer": "ralphie02",
-  "url": "https://qmk.fm/keyboards/",
-  "maintainer": "ralphie02",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-    "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "tapping": {
-    "toggle": 1
-  },
-  "layouts": {
-    "LAYOUT_6x6": {
-      "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": [6, 0], "x": 11, "y": 0},
-        {"matrix": [6, 1], "x": 12, "y": 0},
-        {"matrix": [6, 2], "x": 13, "y": 0},
-        {"matrix": [6, 3], "x": 14, "y": 0},
-        {"matrix": [6, 4], "x": 15, "y": 0},
-        {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
-        {"matrix": [7, 1], "x": 12, "y": 1},
-        {"matrix": [7, 2], "x": 13, "y": 1},
-        {"matrix": [7, 3], "x": 14, "y": 1},
-        {"matrix": [7, 4], "x": 15, "y": 1},
-        {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
-        {"matrix": [8, 1], "x": 12, "y": 2},
-        {"matrix": [8, 2], "x": 13, "y": 2},
-        {"matrix": [8, 3], "x": 14, "y": 2},
-        {"matrix": [8, 4], "x": 15, "y": 2},
-        {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
-        {"matrix": [9, 1], "x": 12, "y": 3},
-        {"matrix": [9, 2], "x": 13, "y": 3},
-        {"matrix": [9, 3], "x": 14, "y": 3},
-        {"matrix": [9, 4], "x": 15, "y": 3},
-        {"matrix": [9, 5], "x": 16, "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": [10, 1], "x": 12, "y": 4},
-        {"matrix": [10, 2], "x": 13, "y": 4},
-        {"matrix": [10, 3], "x": 14, "y": 4},
-        {"matrix": [10, 4], "x": 15, "y": 4},
-        {"matrix": [10, 5], "x": 16, "y": 4},
-
-        {"matrix": [5, 5], "x": 6, "y": 5},
-        {"matrix": [5, 4], "x": 7, "y": 5},
-
-        {"matrix": [11, 1], "x": 9, "y": 5},
-        {"matrix": [11, 0], "x": 10, "y": 5},
-
-        {"matrix": [5, 3], "x": 7, "y": 6},
-
-        {"matrix": [11, 2], "x": 9, "y": 6},
-
-        {"matrix": [5, 0], "x": 5, "y": 7, "h": 2},
-        {"matrix": [5, 1], "x": 6, "y": 7, "h": 2},
-        {"matrix": [5, 2], "x": 7, "y": 7},
-
-        {"matrix": [11, 3], "x": 9, "y": 7},
-        {"matrix": [11, 4], "x": 10, "y": 7, "h": 2},
-        {"matrix": [11, 5], "x": 11, "y": 7, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/dactyl_rah/keyboard.json b/keyboards/handwired/dactyl_rah/keyboard.json
new file mode 100644
index 00000000000..f550a055c7f
--- /dev/null
+++ b/keyboards/handwired/dactyl_rah/keyboard.json
@@ -0,0 +1,124 @@
+{
+  "keyboard_name": "Dactyl RAH",
+  "manufacturer": "ralphie02",
+  "url": "https://qmk.fm/keyboards/",
+  "maintainer": "ralphie02",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": true,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+    "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "tapping": {
+    "toggle": 1
+  },
+  "layouts": {
+    "LAYOUT_6x6": {
+      "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": [6, 0], "x": 11, "y": 0},
+        {"matrix": [6, 1], "x": 12, "y": 0},
+        {"matrix": [6, 2], "x": 13, "y": 0},
+        {"matrix": [6, 3], "x": 14, "y": 0},
+        {"matrix": [6, 4], "x": 15, "y": 0},
+        {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+        {"matrix": [7, 1], "x": 12, "y": 1},
+        {"matrix": [7, 2], "x": 13, "y": 1},
+        {"matrix": [7, 3], "x": 14, "y": 1},
+        {"matrix": [7, 4], "x": 15, "y": 1},
+        {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+        {"matrix": [8, 1], "x": 12, "y": 2},
+        {"matrix": [8, 2], "x": 13, "y": 2},
+        {"matrix": [8, 3], "x": 14, "y": 2},
+        {"matrix": [8, 4], "x": 15, "y": 2},
+        {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+        {"matrix": [9, 1], "x": 12, "y": 3},
+        {"matrix": [9, 2], "x": 13, "y": 3},
+        {"matrix": [9, 3], "x": 14, "y": 3},
+        {"matrix": [9, 4], "x": 15, "y": 3},
+        {"matrix": [9, 5], "x": 16, "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": [10, 1], "x": 12, "y": 4},
+        {"matrix": [10, 2], "x": 13, "y": 4},
+        {"matrix": [10, 3], "x": 14, "y": 4},
+        {"matrix": [10, 4], "x": 15, "y": 4},
+        {"matrix": [10, 5], "x": 16, "y": 4},
+
+        {"matrix": [5, 5], "x": 6, "y": 5},
+        {"matrix": [5, 4], "x": 7, "y": 5},
+
+        {"matrix": [11, 1], "x": 9, "y": 5},
+        {"matrix": [11, 0], "x": 10, "y": 5},
+
+        {"matrix": [5, 3], "x": 7, "y": 6},
+
+        {"matrix": [11, 2], "x": 9, "y": 6},
+
+        {"matrix": [5, 0], "x": 5, "y": 7, "h": 2},
+        {"matrix": [5, 1], "x": 6, "y": 7, "h": 2},
+        {"matrix": [5, 2], "x": 7, "y": 7},
+
+        {"matrix": [11, 3], "x": 9, "y": 7},
+        {"matrix": [11, 4], "x": 10, "y": 7, "h": 2},
+        {"matrix": [11, 5], "x": 11, "y": 7, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_rah/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dqz11n1g/matrix.c b/keyboards/handwired/dqz11n1g/matrix.c
index d93dd853b6a..398f961aa5f 100644
--- a/keyboards/handwired/dqz11n1g/matrix.c
+++ b/keyboards/handwired/dqz11n1g/matrix.c
@@ -15,14 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <avr/io.h>
-
 #include "spi_master.h"
-#include "quantum.h"
 #include "matrix.h"
 
 static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c
index c9e0cb288cb..67b84c3bc88 100644
--- a/keyboards/handwired/dygma/raise/ansi/ansi.c
+++ b/keyboards/handwired/dygma/raise/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "raise.h"
 
 // "led_map" is taken from kaleidoscope
 // LHK = Left Hand Keys
diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c
index 48ba85bf902..9643af7b8c0 100644
--- a/keyboards/handwired/dygma/raise/iso/iso.c
+++ b/keyboards/handwired/dygma/raise/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "raise.h"
 
 // "led_map" is taken from kaleidoscope
 // LHK = Left Hand Keys
diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c
index 53fa3892069..ad156445793 100644
--- a/keyboards/handwired/dygma/raise/leds.c
+++ b/keyboards/handwired/dygma/raise/leds.c
@@ -14,15 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "leds.h"
+#include <string.h>
 #include "i2c_master.h"
 #include "led_tables.h"
 #include "rgb_matrix.h"
-#include <string.h>
+#include "wait.h"
 #include "raise.h"
 #include "wire-protocol-constants.h"
 #include "print.h"
-#include "leds.h"
 
 // Color order of LEDs is Green, Red, Blue.
 typedef struct PACKED {
diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h
index c25a4326a90..1b7bfce2e2d 100644
--- a/keyboards/handwired/dygma/raise/leds.h
+++ b/keyboards/handwired/dygma/raise/leds.h
@@ -16,8 +16,7 @@
 
 #pragma once
 
-#include "quantum.h"
-#include "rgb_matrix.h"
+#include <stdint.h>
 
 extern const uint8_t led_map[RGB_MATRIX_LED_COUNT];
 
diff --git a/keyboards/handwired/dygma/raise/matrix.c b/keyboards/handwired/dygma/raise/matrix.c
index bbcf697a594..3f241e8973d 100644
--- a/keyboards/handwired/dygma/raise/matrix.c
+++ b/keyboards/handwired/dygma/raise/matrix.c
@@ -13,8 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_master.h"
+#include "wait.h"
 #include <string.h>
 #include "wire-protocol-constants.h"
 
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
deleted file mode 100644
index 9a43e14c883..00000000000
--- a/keyboards/handwired/elrgo_s/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "keyboard_name": "Elrgo S",
-    "manufacturer": "Eloren",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x454C",
-        "pid": "0x3436",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_split_3x6_5": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [4, 0], "x": 9, "y": 0},
-                {"matrix": [4, 1], "x": 10, "y": 0},
-                {"matrix": [4, 2], "x": 11, "y": 0},
-                {"matrix": [4, 3], "x": 12, "y": 0},
-                {"matrix": [4, 4], "x": 13, "y": 0},
-                {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [5, 4], "x": 13, "y": 1},
-                {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
-                {"matrix": [6, 1], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 3], "x": 12, "y": 2},
-                {"matrix": [6, 4], "x": 13, "y": 2},
-                {"matrix": [6, 5], "x": 14, "y": 2},
-
-                {"matrix": [3, 1], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 4], "x": 6, "y": 3},
-
-                {"matrix": [3, 5], "x": 6, "y": 2},
-
-                {"matrix": [7, 0], "x": 8, "y": 2},
-
-                {"matrix": [7, 1], "x": 8, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3},
-                {"matrix": [7, 3], "x": 10, "y": 3},
-                {"matrix": [7, 4], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/elrgo_s/keyboard.json b/keyboards/handwired/elrgo_s/keyboard.json
new file mode 100644
index 00000000000..0da809d2ac5
--- /dev/null
+++ b/keyboards/handwired/elrgo_s/keyboard.json
@@ -0,0 +1,91 @@
+{
+    "keyboard_name": "Elrgo S",
+    "manufacturer": "Eloren",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x454C",
+        "pid": "0x3436",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_split_3x6_5": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 0], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "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": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1},
+                {"matrix": [5, 5], "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": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2},
+                {"matrix": [6, 5], "x": 14, "y": 2},
+
+                {"matrix": [3, 1], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 6, "y": 3},
+
+                {"matrix": [3, 5], "x": 6, "y": 2},
+
+                {"matrix": [7, 0], "x": 8, "y": 2},
+
+                {"matrix": [7, 1], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 3], "x": 10, "y": 3},
+                {"matrix": [7, 4], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk
deleted file mode 100644
index 04b1fc01b7f..00000000000
--- a/keyboards/handwired/elrgo_s/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
deleted file mode 100644
index 0be6c8cdb98..00000000000
--- a/keyboards/handwired/freoduo/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-"keyboard_name": "Freoduo",
-"manufacturer": "ParyzFilip",
-"url": "https://github.com/FilipParyz",
-"maintainer": "https://github.com/FilipParyz",
-"usb": {
-    "vid": "0xB141",
-    "pid": "0x0602",
-    "device_version": "0.0.1"
-},
-"matrix_pins": {
-    "cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
-    "rows": ["C6", "D7", "E6", "B4", "B5"]
-},
-"diode_direction": "COL2ROW",
-"split": {
-    "soft_serial_pin": "D0"
-},
-"rgblight": {
-    "hue_steps": 16,
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 30,
-    "sleep": true,
-    "led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
-    "split_count": [16, 14],
-    "animations": {
-        "breathing": true,
-        "rainbow_mood": true,
-        "rainbow_swirl": true,
-        "snake": true,
-        "knight": true,
-        "christmas": true,
-        "static_gradient": true,
-        "rgb_test": true,
-        "alternating": true,
-        "twinkle": true
-    }
-},
-"ws2812": {
-    "pin": "D4"
-},
-"processor": "atmega32u4",
-"bootloader": "caterina",
-"debounce": 3,
-"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": [5, 0], "x": 7, "y": 0},
-            {"matrix": [5, 1], "x": 8, "y": 0},
-            {"matrix": [5, 2], "x": 9, "y": 0},
-            {"matrix": [5, 3], "x": 10, "y": 0},
-            {"matrix": [5, 4], "x": 11, "y": 0},
-            {"matrix": [5, 5], "x": 12, "y": 0},
-
-            {"matrix": [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": [6, 0], "x": 7, "y": 1},
-            {"matrix": [6, 1], "x": 8, "y": 1},
-            {"matrix": [6, 2], "x": 9, "y": 1},
-            {"matrix": [6, 3], "x": 10, "y": 1},
-            {"matrix": [6, 4], "x": 11, "y": 1},
-            {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
-            {"matrix": [7, 1], "x": 8, "y": 2},
-            {"matrix": [7, 2], "x": 9, "y": 2},
-            {"matrix": [7, 3], "x": 10, "y": 2},
-            {"matrix": [7, 4], "x": 11, "y": 2},
-            {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
-            {"matrix": [8, 1], "x": 8, "y": 3},
-            {"matrix": [8, 2], "x": 9, "y": 3},
-            {"matrix": [8, 3], "x": 10, "y": 3},
-            {"matrix": [8, 4], "x": 11, "y": 3},
-            {"matrix": [8, 5], "x": 12, "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, "w": 2},
-
-            {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
-            {"matrix": [9, 2], "x": 9, "y": 4},
-            {"matrix": [9, 3], "x": 10, "y": 4},
-            {"matrix": [9, 4], "x": 11, "y": 4},
-            {"matrix": [9, 5], "x": 12, "y": 4}
-        ]
-    }
-}
-}
diff --git a/keyboards/handwired/freoduo/keyboard.json b/keyboards/handwired/freoduo/keyboard.json
new file mode 100644
index 00000000000..0d23776f4a6
--- /dev/null
+++ b/keyboards/handwired/freoduo/keyboard.json
@@ -0,0 +1,130 @@
+{
+"keyboard_name": "Freoduo",
+"manufacturer": "ParyzFilip",
+"url": "https://github.com/FilipParyz",
+"maintainer": "https://github.com/FilipParyz",
+"usb": {
+    "vid": "0xB141",
+    "pid": "0x0602",
+    "device_version": "0.0.1"
+},
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true,
+    "velocikey": true
+  },
+"matrix_pins": {
+    "cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+},
+"diode_direction": "COL2ROW",
+"split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+},
+"rgblight": {
+    "hue_steps": 16,
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 30,
+    "sleep": true,
+    "led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
+    "split_count": [16, 14],
+    "animations": {
+        "breathing": true,
+        "rainbow_mood": true,
+        "rainbow_swirl": true,
+        "snake": true,
+        "knight": true,
+        "christmas": true,
+        "static_gradient": true,
+        "rgb_test": true,
+        "alternating": true,
+        "twinkle": true
+    }
+},
+"ws2812": {
+    "pin": "D4"
+},
+"processor": "atmega32u4",
+"bootloader": "caterina",
+"debounce": 3,
+"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": [5, 0], "x": 7, "y": 0},
+            {"matrix": [5, 1], "x": 8, "y": 0},
+            {"matrix": [5, 2], "x": 9, "y": 0},
+            {"matrix": [5, 3], "x": 10, "y": 0},
+            {"matrix": [5, 4], "x": 11, "y": 0},
+            {"matrix": [5, 5], "x": 12, "y": 0},
+
+            {"matrix": [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": [6, 0], "x": 7, "y": 1},
+            {"matrix": [6, 1], "x": 8, "y": 1},
+            {"matrix": [6, 2], "x": 9, "y": 1},
+            {"matrix": [6, 3], "x": 10, "y": 1},
+            {"matrix": [6, 4], "x": 11, "y": 1},
+            {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+            {"matrix": [7, 1], "x": 8, "y": 2},
+            {"matrix": [7, 2], "x": 9, "y": 2},
+            {"matrix": [7, 3], "x": 10, "y": 2},
+            {"matrix": [7, 4], "x": 11, "y": 2},
+            {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+            {"matrix": [8, 1], "x": 8, "y": 3},
+            {"matrix": [8, 2], "x": 9, "y": 3},
+            {"matrix": [8, 3], "x": 10, "y": 3},
+            {"matrix": [8, 4], "x": 11, "y": 3},
+            {"matrix": [8, 5], "x": 12, "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, "w": 2},
+
+            {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+            {"matrix": [9, 2], "x": 9, "y": 4},
+            {"matrix": [9, 3], "x": 10, "y": 4},
+            {"matrix": [9, 4], "x": 11, "y": 4},
+            {"matrix": [9, 5], "x": 12, "y": 4}
+        ]
+    }
+}
+}
diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk
deleted file mode 100644
index ed940647bba..00000000000
--- a/keyboards/handwired/freoduo/rules.mk
+++ /dev/null
@@ -1,14 +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
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-VELOCIKEY_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
deleted file mode 100644
index fd121427291..00000000000
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
-    "keyboard_name": "split_65",
-    "manufacturer": "jtallbean",
-    "url": "",
-    "maintainer": "samlli",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
-        "rows": ["F4", "F1", "F0", "C7", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"],
-                "rows": ["E6", "F0", "F1", "F7", "D7"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
-                {"label": "`", "matrix": [5, 6], "x": 15.25, "y": 0},
-                {"label": "Backspace", "matrix": [5, 7], "x": 16.25, "y": 0},
-                {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
-
-                {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
-
-                {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
-
-                {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
-
-                {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
-                {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
-                {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
-                {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
-                {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
-                {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
-                {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
-
-                {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
-
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
-
-                {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
-                {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
-                {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
-                {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_2u_bs": {
-            "layout": [
-                {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
-
-                {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
-
-                {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
-
-                {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
-
-                {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
-                {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
-                {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
-                {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
-                {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
-                {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
-                {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
-
-                {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
-                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-
-                {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
-
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
-
-                {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
-                {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
-                {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
-                {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/jtallbean/split_65/keyboard.json b/keyboards/handwired/jtallbean/split_65/keyboard.json
new file mode 100644
index 00000000000..d1b974a59be
--- /dev/null
+++ b/keyboards/handwired/jtallbean/split_65/keyboard.json
@@ -0,0 +1,225 @@
+{
+    "keyboard_name": "split_65",
+    "manufacturer": "jtallbean",
+    "url": "",
+    "maintainer": "samlli",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
+        "rows": ["F4", "F1", "F0", "C7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"],
+                "rows": ["E6", "F0", "F1", "F7", "D7"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
+                {"label": "`", "matrix": [5, 6], "x": 15.25, "y": 0},
+                {"label": "Backspace", "matrix": [5, 7], "x": 16.25, "y": 0},
+                {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
+
+                {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
+
+                {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
+
+                {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
+
+                {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
+                {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
+                {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
+                {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
+                {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
+                {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+                {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
+
+                {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
+
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+
+                {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
+                {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
+                {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
+                {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
+
+                {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
+
+                {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
+
+                {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
+
+                {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
+                {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
+                {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
+                {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
+                {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
+                {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+                {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
+
+                {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
+
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+
+                {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
+                {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
+                {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
+                {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk
deleted file mode 100644
index c644dd59ee1..00000000000
--- a/keyboards/handwired/jtallbean/split_65/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD = yes        # Enable split keyboard support
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json
deleted file mode 100644
index 6fcd1c12bb8..00000000000
--- a/keyboards/handwired/ks63/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "keyboard_name": "ks63",
-    "manufacturer": "kleshwong",
-    "url": "",
-    "maintainer": "Klesh Wong",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3061",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["B5", "B4", "E6", "D7", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "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": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 7], "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": [6, 0], "x": 6.5, "y": 1},
-                {"matrix": [6, 1], "x": 7.5, "y": 1},
-                {"matrix": [6, 2], "x": 8.5, "y": 1},
-                {"matrix": [6, 3], "x": 9.5, "y": 1},
-                {"matrix": [6, 4], "x": 10.5, "y": 1},
-                {"matrix": [6, 5], "x": 11.5, "y": 1},
-                {"matrix": [6, 6], "x": 12.5, "y": 1},
-                {"matrix": [6, 7], "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": [7, 0], "x": 6.75, "y": 2},
-                {"matrix": [7, 1], "x": 7.75, "y": 2},
-                {"matrix": [7, 2], "x": 8.75, "y": 2},
-                {"matrix": [7, 3], "x": 9.75, "y": 2},
-                {"matrix": [7, 4], "x": 10.75, "y": 2},
-                {"matrix": [7, 5], "x": 11.75, "y": 2},
-                {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [8, 0], "x": 7.25, "y": 3},
-                {"matrix": [8, 1], "x": 8.25, "y": 3},
-                {"matrix": [8, 2], "x": 9.25, "y": 3},
-                {"matrix": [8, 3], "x": 10.25, "y": 3},
-                {"matrix": [8, 4], "x": 11.25, "y": 3},
-                {"matrix": [8, 6], "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, 4], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/ks63/keyboard.json b/keyboards/handwired/ks63/keyboard.json
new file mode 100644
index 00000000000..542cd76811e
--- /dev/null
+++ b/keyboards/handwired/ks63/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "ks63",
+    "manufacturer": "kleshwong",
+    "url": "",
+    "maintainer": "Klesh Wong",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3061",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 7], "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": [6, 0], "x": 6.5, "y": 1},
+                {"matrix": [6, 1], "x": 7.5, "y": 1},
+                {"matrix": [6, 2], "x": 8.5, "y": 1},
+                {"matrix": [6, 3], "x": 9.5, "y": 1},
+                {"matrix": [6, 4], "x": 10.5, "y": 1},
+                {"matrix": [6, 5], "x": 11.5, "y": 1},
+                {"matrix": [6, 6], "x": 12.5, "y": 1},
+                {"matrix": [6, 7], "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": [7, 0], "x": 6.75, "y": 2},
+                {"matrix": [7, 1], "x": 7.75, "y": 2},
+                {"matrix": [7, 2], "x": 8.75, "y": 2},
+                {"matrix": [7, 3], "x": 9.75, "y": 2},
+                {"matrix": [7, 4], "x": 10.75, "y": 2},
+                {"matrix": [7, 5], "x": 11.75, "y": 2},
+                {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [8, 0], "x": 7.25, "y": 3},
+                {"matrix": [8, 1], "x": 8.25, "y": 3},
+                {"matrix": [8, 2], "x": 9.25, "y": 3},
+                {"matrix": [8, 3], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 6], "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, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk
deleted file mode 100644
index 12dd064c625..00000000000
--- a/keyboards/handwired/ks63/rules.mk
+++ /dev/null
@@ -1,14 +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 = 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
index 243f9a5d7bd..0c968c419d8 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "matrix_pins": {
             "right": {
                 "cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk
index f4af87851c7..256826f7fcc 100644
--- a/keyboards/handwired/lagrange/rules.mk
+++ b/keyboards/handwired/lagrange/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
-SPLIT_KEYBOARD = yes
 SPLIT_TRANSPORT = custom
 
 SRC += transport.c
diff --git a/keyboards/handwired/lagrange/transport.c b/keyboards/handwired/lagrange/transport.c
index 8f6973925ff..ec91cff3068 100644
--- a/keyboards/handwired/lagrange/transport.c
+++ b/keyboards/handwired/lagrange/transport.c
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <spi_master.h>
-
-#include "quantum.h"
+#include "spi_master.h"
 #include "split_util.h"
 #include "transport.h"
 #include "timer.h"
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index eae71d95083..cd5de808f4d 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index e09e2e2bbe9..21c4a23eb3b 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Enables split keyboard support
 OLED_ENABLE = yes
 NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
deleted file mode 100644
index b5298dfae4d..00000000000
--- a/keyboards/handwired/not_so_minidox/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "keyboard_name": "Not So MiniDox",
-  "manufacturer": "mtdjr",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3060",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
-    "rows": ["D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.375},
-        {"matrix": [0, 1], "x": 1, "y": 0.25},
-        {"matrix": [0, 2], "x": 2, "y": 0.125},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.125},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-        {"matrix": [4, 5], "x": 8, "y": 0.25},
-        {"matrix": [4, 4], "x": 9, "y": 0.125},
-        {"matrix": [4, 3], "x": 10, "y": 0},
-        {"matrix": [4, 2], "x": 11, "y": 0.125},
-        {"matrix": [4, 1], "x": 12, "y": 0.25},
-        {"matrix": [4, 0], "x": 13, "y": 0.375},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.375},
-        {"matrix": [1, 1], "x": 1, "y": 1.25},
-        {"matrix": [1, 2], "x": 2, "y": 1.125},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.125},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-        {"matrix": [5, 5], "x": 8, "y": 1.25},
-        {"matrix": [5, 4], "x": 9, "y": 1.125},
-        {"matrix": [5, 3], "x": 10, "y": 1},
-        {"matrix": [5, 2], "x": 11, "y": 1.125},
-        {"matrix": [5, 1], "x": 12, "y": 1.25},
-        {"matrix": [5, 0], "x": 13, "y": 1.375},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.375},
-        {"matrix": [2, 1], "x": 1, "y": 2.25},
-        {"matrix": [2, 2], "x": 2, "y": 2.125},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.125},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-        {"matrix": [6, 5], "x": 8, "y": 2.25},
-        {"matrix": [6, 4], "x": 9, "y": 2.125},
-        {"matrix": [6, 3], "x": 10, "y": 2},
-        {"matrix": [6, 2], "x": 11, "y": 2.125},
-        {"matrix": [6, 1], "x": 12, "y": 2.25},
-        {"matrix": [6, 0], "x": 13, "y": 2.375},
-
-        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
-        {"matrix": [3, 4], "x": 4.5, "y": 4.75},
-        {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
-
-        {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
-        {"matrix": [7, 4], "x": 8.5, "y": 4.75},
-        {"matrix": [7, 3], "x": 9.5, "y": 4.75}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/not_so_minidox/keyboard.json b/keyboards/handwired/not_so_minidox/keyboard.json
new file mode 100644
index 00000000000..b48eba771bd
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keyboard.json
@@ -0,0 +1,85 @@
+{
+  "keyboard_name": "Not So MiniDox",
+  "manufacturer": "mtdjr",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.375},
+        {"matrix": [0, 1], "x": 1, "y": 0.25},
+        {"matrix": [0, 2], "x": 2, "y": 0.125},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.125},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+        {"matrix": [4, 5], "x": 8, "y": 0.25},
+        {"matrix": [4, 4], "x": 9, "y": 0.125},
+        {"matrix": [4, 3], "x": 10, "y": 0},
+        {"matrix": [4, 2], "x": 11, "y": 0.125},
+        {"matrix": [4, 1], "x": 12, "y": 0.25},
+        {"matrix": [4, 0], "x": 13, "y": 0.375},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.375},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.125},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.125},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+        {"matrix": [5, 5], "x": 8, "y": 1.25},
+        {"matrix": [5, 4], "x": 9, "y": 1.125},
+        {"matrix": [5, 3], "x": 10, "y": 1},
+        {"matrix": [5, 2], "x": 11, "y": 1.125},
+        {"matrix": [5, 1], "x": 12, "y": 1.25},
+        {"matrix": [5, 0], "x": 13, "y": 1.375},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.375},
+        {"matrix": [2, 1], "x": 1, "y": 2.25},
+        {"matrix": [2, 2], "x": 2, "y": 2.125},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.125},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+        {"matrix": [6, 5], "x": 8, "y": 2.25},
+        {"matrix": [6, 4], "x": 9, "y": 2.125},
+        {"matrix": [6, 3], "x": 10, "y": 2},
+        {"matrix": [6, 2], "x": 11, "y": 2.125},
+        {"matrix": [6, 1], "x": 12, "y": 2.25},
+        {"matrix": [6, 0], "x": 13, "y": 2.375},
+
+        {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+        {"matrix": [3, 4], "x": 4.5, "y": 4.75},
+        {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
+
+        {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
+        {"matrix": [7, 4], "x": 8.5, "y": 4.75},
+        {"matrix": [7, 3], "x": 9.5, "y": 4.75}
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/handwired/not_so_minidox/rules.mk
+++ /dev/null
@@ -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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
index d7253971998..0cf3573a072 100644
--- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
@@ -175,11 +175,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
         case QWERTY:
@@ -187,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_qwerty);
             #endif
-            persistent_default_layer_set(1UL<<_QWERTY);
+            set_single_persistent_default_layer(_QWERTY);
           }
           return false;
           break;
@@ -196,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_colemak);
             #endif
-            persistent_default_layer_set(1UL<<_COLEMAK);
+            set_single_persistent_default_layer(_COLEMAK);
           }
           return false;
           break;
@@ -205,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #ifdef AUDIO_ENABLE
               PLAY_SONG(tone_dvorak);
             #endif
-            persistent_default_layer_set(1UL<<_DVORAK);
+            set_single_persistent_default_layer(_DVORAK);
           }
           return false;
           break;
diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c
index a89e438ae8b..b1ef23bc289 100644
--- a/keyboards/handwired/polly40/keymaps/default/keymap.c
+++ b/keyboards/handwired/polly40/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
-        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S),  MAGIC_TOGGLE_NKRO,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
+        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S),  NK_TOGG,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_PGDN, _______  
     ),
 
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index ff73e51d5eb..7db69a2a978 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #include "eeconfig.h"
 #include "process_unicode.h"
-#include "quantum.h"
 #ifdef RGBSPS_ENABLE
 #include "rgbsps.h"
 #include "rgbtheme.h"
@@ -941,9 +940,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
+void persistent_default_layer_set(uint8_t default_layer) {
+  set_single_persistent_default_layer(default_layer);
 #ifdef RGBSPS_ENABLE
   led_set_default_layer_indicator();
 #endif
@@ -1120,14 +1118,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     // layout switchers
     case QWERTY:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
+        persistent_default_layer_set(_QWERTY);
       }
       return false;
       break;
 #ifdef LAYOUT_DVORAK
     case DVORAK:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_DVORAK);
+        persistent_default_layer_set(_DVORAK);
       }
       return false;
       break;
@@ -1135,7 +1133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef LAYOUT_COLEMAK
     case COLEMAK:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        persistent_default_layer_set(_COLEMAK);
       }
       return false;
       break;
@@ -1143,7 +1141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef LAYOUT_WORKMAN
     case WORKMAN:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_WORKMAN);
+        persistent_default_layer_set(_WORKMAN);
       }
       return false;
       break;
@@ -1151,7 +1149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef LAYOUT_NORMAN
     case NORMAN:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_NORMAN);
+        persistent_default_layer_set(_NORMAN);
       }
       return false;
       break;
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/proto/keyboard.json
similarity index 100%
rename from keyboards/handwired/qc60/info.json
rename to keyboards/handwired/qc60/proto/keyboard.json
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index d3fadcace20..f39f439c50e 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
     _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
 )
 
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index c1ff5682fcb..74308a1c19f 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
     _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______,  _______, KC_DEL,
     _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______,  _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
 )
 
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
deleted file mode 100644
index d36024c67cd..00000000000
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "keyboard_name": "Dactyl Min (3x5_5)",
-    "manufacturer": "skakunm",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "D7", "E6", "B4", "B5"],
-        "rows": ["B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_3x5_5": {
-            "layout": [
-                {"matrix": [2, 4], "x": 0, "y": 0},
-                {"matrix": [2, 3], "x": 1, "y": 0},
-                {"matrix": [2, 2], "x": 2, "y": 0},
-                {"matrix": [2, 1], "x": 3, "y": 0},
-                {"matrix": [2, 0], "x": 4, "y": 0},
-
-                {"matrix": [6, 0], "x": 9, "y": 0},
-                {"matrix": [6, 1], "x": 10, "y": 0},
-                {"matrix": [6, 2], "x": 11, "y": 0},
-                {"matrix": [6, 3], "x": 12, "y": 0},
-                {"matrix": [6, 4], "x": 13, "y": 0},
-
-                {"matrix": [1, 4], "x": 0, "y": 1},
-                {"matrix": [1, 3], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 0], "x": 4, "y": 1},
-
-                {"matrix": [5, 0], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 3], "x": 12, "y": 1},
-                {"matrix": [5, 4], "x": 13, "y": 1},
-
-                {"matrix": [0, 4], "x": 0, "y": 2},
-                {"matrix": [0, 3], "x": 1, "y": 2},
-                {"matrix": [0, 2], "x": 2, "y": 2},
-                {"matrix": [0, 1], "x": 3, "y": 2},
-                {"matrix": [0, 0], "x": 4, "y": 2},
-
-                {"matrix": [4, 0], "x": 9, "y": 2},
-                {"matrix": [4, 1], "x": 10, "y": 2},
-                {"matrix": [4, 2], "x": 11, "y": 2},
-                {"matrix": [4, 3], "x": 12, "y": 2},
-                {"matrix": [4, 4], "x": 13, "y": 2},
-
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-
-                {"matrix": [7, 3], "x": 8, "y": 3},
-                {"matrix": [7, 4], "x": 9, "y": 3},
-
-                {"matrix": [3, 0], "x": 4, "y": 4},
-                {"matrix": [3, 1], "x": 5, "y": 4},
-                {"matrix": [3, 2], "x": 6, "y": 4},
-                {"matrix": [7, 2], "x": 7, "y": 4},
-                {"matrix": [7, 1], "x": 8, "y": 4},
-                {"matrix": [7, 0], "x": 9, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/skakunm_dactyl/keyboard.json b/keyboards/handwired/skakunm_dactyl/keyboard.json
new file mode 100644
index 00000000000..91ee5b1fb6c
--- /dev/null
+++ b/keyboards/handwired/skakunm_dactyl/keyboard.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Dactyl Min (3x5_5)",
+    "manufacturer": "skakunm",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_3x5_5": {
+            "layout": [
+                {"matrix": [2, 4], "x": 0, "y": 0},
+                {"matrix": [2, 3], "x": 1, "y": 0},
+                {"matrix": [2, 2], "x": 2, "y": 0},
+                {"matrix": [2, 1], "x": 3, "y": 0},
+                {"matrix": [2, 0], "x": 4, "y": 0},
+
+                {"matrix": [6, 0], "x": 9, "y": 0},
+                {"matrix": [6, 1], "x": 10, "y": 0},
+                {"matrix": [6, 2], "x": 11, "y": 0},
+                {"matrix": [6, 3], "x": 12, "y": 0},
+                {"matrix": [6, 4], "x": 13, "y": 0},
+
+                {"matrix": [1, 4], "x": 0, "y": 1},
+                {"matrix": [1, 3], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 4, "y": 1},
+
+                {"matrix": [5, 0], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1},
+
+                {"matrix": [0, 4], "x": 0, "y": 2},
+                {"matrix": [0, 3], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 2},
+                {"matrix": [0, 1], "x": 3, "y": 2},
+                {"matrix": [0, 0], "x": 4, "y": 2},
+
+                {"matrix": [4, 0], "x": 9, "y": 2},
+                {"matrix": [4, 1], "x": 10, "y": 2},
+                {"matrix": [4, 2], "x": 11, "y": 2},
+                {"matrix": [4, 3], "x": 12, "y": 2},
+                {"matrix": [4, 4], "x": 13, "y": 2},
+
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+
+                {"matrix": [7, 3], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+
+                {"matrix": [3, 0], "x": 4, "y": 4},
+                {"matrix": [3, 1], "x": 5, "y": 4},
+                {"matrix": [3, 2], "x": 6, "y": 4},
+                {"matrix": [7, 2], "x": 7, "y": 4},
+                {"matrix": [7, 1], "x": 8, "y": 4},
+                {"matrix": [7, 0], "x": 9, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk
deleted file mode 100644
index 7f1fc659ccb..00000000000
--- a/keyboards/handwired/skakunm_dactyl/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
deleted file mode 100644
index ea41cb3ac17..00000000000
--- a/keyboards/handwired/split65/promicro/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"],
-        "io_delay": 5
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "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": [5, 7], "x": 8, "y": 0},
-                {"matrix": [5, 6], "x": 9, "y": 0},
-                {"matrix": [5, 5], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 3], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
-                {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1},
-                {"matrix": [6, 6], "x": 8.5, "y": 1},
-                {"matrix": [6, 5], "x": 9.5, "y": 1},
-                {"matrix": [6, 4], "x": 10.5, "y": 1},
-                {"matrix": [6, 3], "x": 11.5, "y": 1},
-                {"matrix": [6, 2], "x": 12.5, "y": 1},
-                {"matrix": [6, 1], "x": 13.5, "y": 1},
-                {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2},
-                {"matrix": [7, 7], "x": 8.75, "y": 2},
-                {"matrix": [7, 6], "x": 9.75, "y": 2},
-                {"matrix": [7, 5], "x": 10.75, "y": 2},
-                {"matrix": [7, 4], "x": 11.75, "y": 2},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 2], "x": 13.75, "y": 2},
-                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [7, 0], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 7], "x": 8.25, "y": 3},
-                {"matrix": [8, 6], "x": 9.25, "y": 3},
-                {"matrix": [8, 5], "x": 10.25, "y": 3},
-                {"matrix": [8, 4], "x": 11.25, "y": 3},
-                {"matrix": [8, 3], "x": 12.25, "y": 3},
-                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
-
-                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
-                {"matrix": [9, 5], "x": 10.25, "y": 4},
-                {"matrix": [9, 4], "x": 11.25, "y": 4},
-                {"matrix": [9, 3], "x": 12.25, "y": 4},
-
-                {"matrix": [9, 2], "x": 14, "y": 4},
-                {"matrix": [9, 1], "x": 15, "y": 4},
-                {"matrix": [9, 0], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/handwired/split65/promicro/keyboard.json b/keyboards/handwired/split65/promicro/keyboard.json
new file mode 100644
index 00000000000..5efdd93629f
--- /dev/null
+++ b/keyboards/handwired/split65/promicro/keyboard.json
@@ -0,0 +1,109 @@
+{
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"],
+        "io_delay": 5
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "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": [5, 7], "x": 8, "y": 0},
+                {"matrix": [5, 6], "x": 9, "y": 0},
+                {"matrix": [5, 5], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+                {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [6, 6], "x": 8.5, "y": 1},
+                {"matrix": [6, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 4], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 12.5, "y": 1},
+                {"matrix": [6, 1], "x": 13.5, "y": 1},
+                {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2},
+                {"matrix": [7, 7], "x": 8.75, "y": 2},
+                {"matrix": [7, 6], "x": 9.75, "y": 2},
+                {"matrix": [7, 5], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 2], "x": 13.75, "y": 2},
+                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 0], "x": 16, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 7], "x": 8.25, "y": 3},
+                {"matrix": [8, 6], "x": 9.25, "y": 3},
+                {"matrix": [8, 5], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 4], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 14, "y": 4},
+                {"matrix": [9, 1], "x": 15, "y": 4},
+                {"matrix": [9, 0], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk
deleted file mode 100644
index 3bc7f499ecd..00000000000
--- a/keyboards/handwired/split65/promicro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index 61aff0e7eab..a9693b3a5b9 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -6,6 +6,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A9"
     },
     "processor": "STM32F303",
diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
index 5033bd1e21f..94186bf8c72 100644
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ b/keyboards/handwired/split65/stm32/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
 OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
deleted file mode 100644
index dfc1198c588..00000000000
--- a/keyboards/handwired/split89/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "split89",
-    "manufacturer": "jurassic73",
-    "url": "https://github.com/jurassic73/split89",
-    "maintainer": "jurassic73",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
-                "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                    {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
-                    {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
-                    {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
-                    {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
-                    {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
-                    {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
-                    {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
-                    {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
-                    {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
-                    {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
-                    {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
-                    {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
-                    {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
-                    {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
-                    {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
-                    {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
-                    {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
-                    {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
-                    {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
-                    {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
-                    {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
-                    {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
-                    {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
-                    {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
-                    {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
-                    {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
-                    {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
-                    {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
-                    {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
-                    {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
-                    {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
-                    {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
-                    {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
-                    {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
-                    {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
-                    {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
-                    {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
-                    {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
-                    {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
-                    {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
-                    {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
-                    {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
-                    {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
-                    {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
-                    {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
-                    {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
-                    {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
-                    {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
-                    {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
-                    {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
-                    {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
-                    {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
-                    {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
-                    {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
-                    {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
-                    {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
-                    {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
-                    {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
-                    {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
-                    {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
-                    {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
-                    {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
-                    {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
-                    {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
-                    {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
-                    {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
-                    {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
-                    {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
-                    {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
-                    {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
-                    {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
-                    {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
-                    {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
-                    {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
-                    {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
-                    {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
-                    {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
-                    {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
-                    {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
-                    {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
-                    {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
-                    {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
-                    {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
-                    {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
-                    {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
-                    {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
-                    {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
-                    {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
-                    {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
-                    ]
-        }
-    }
-}
diff --git a/keyboards/handwired/split89/keyboard.json b/keyboards/handwired/split89/keyboard.json
new file mode 100644
index 00000000000..d30105844af
--- /dev/null
+++ b/keyboards/handwired/split89/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "split89",
+    "manufacturer": "jurassic73",
+    "url": "https://github.com/jurassic73/split89",
+    "maintainer": "jurassic73",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
+                "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                    {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
+                    {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
+                    {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
+                    {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
+                    {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
+                    {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
+                    {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
+                    {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
+                    {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
+                    {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
+                    {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
+                    {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
+                    {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
+                    {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
+                    {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
+                    {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
+                    {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
+                    {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
+                    {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
+                    {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
+                    {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
+                    {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
+                    {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
+                    {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
+                    {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
+                    {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
+                    {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
+                    {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
+                    {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
+                    {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
+                    {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
+                    {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
+                    {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
+                    {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
+                    {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
+                    {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
+                    {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
+                    {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
+                    {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
+                    {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
+                    {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
+                    {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
+                    {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
+                    {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
+                    {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
+                    {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
+                    {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
+                    {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
+                    {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
+                    {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
+                    {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
+                    {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
+                    {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
+                    {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
+                    {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
+                    {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
+                    {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
+                    {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+                    {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
+                    {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
+                    {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
+                    {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
+                    {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
+                    {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
+                    {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
+                    {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
+                    {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
+                    {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
+                    {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
+                    {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
+                    {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
+                    {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
+                    {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
+                    {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
+                    {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
+                    {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
+                    {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
+                    {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
+                    {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
+                    {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
+                    {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
+                    {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
+                    {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
+                    {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
+                    {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
+                    {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
+                    {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
+                    ]
+        }
+    }
+}
diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/handwired/split89/rules.mk
+++ /dev/null
@@ -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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index 73ffb66e9b4..07cac23aad5 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1111",
         "device_version": "1.0.0"
     },
+    "split": {
+        "enabled": true
+    },
     "rgblight": {
         "led_count": 12,
         "split_count": [6, 6],
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index cc924d61d83..8d00fcc579f 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -10,6 +10,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
similarity index 100%
rename from keyboards/handwired/stef9998/split_5x7/info.json
rename to keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
similarity index 100%
rename from keyboards/handwired/stef9998/split_5x7/split_5x7.c
rename to keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
index 8a303714cf0..d6fcb0f7939 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
@@ -14,12 +14,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
+#include "atomic_util.h"
 #include "util.h"
+#include "wait.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 #ifndef readPort
 #    include "gpio_extr.h"
 #endif
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
index e31cb5f3a5d..437fa93a201 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <stdint.h>
+
 // clang-format off
 
 #if defined(__AVR__)
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
index 2bc97bd9e81..842df65dbd6 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
@@ -15,17 +15,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 // clang-format off
-#include <stdint.h>
-#include <stdbool.h>
-#include <gpio.h>
 #ifndef readPort
 #    include "gpio_extr.h"
 #endif
+#include "atomic_util.h"
 #include "util.h"
 #include "matrix.h"
 #include "matrix_extr.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #define ALWAYS_INLINE inline __attribute__((always_inline))
 #define NO_INLINE     __attribute__((noinline))
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
index bca53da24c2..202454a2215 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
@@ -16,6 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 // clang-format off
 
+#include "atomic_util.h"
+#include "gpio.h"
+#include "wait.h"
+
 #if defined(MATRIX_EXTENSION_74HC157)
 #    define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb
 #    define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb)
diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json
index 6d544a59466..5d662bf780c 100644
--- a/keyboards/handwired/technicpad/keymaps/default/keymap.json
+++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "technicpad",
+    "keyboard": "handwired/technicpad",
     "keymap": "default",
     "layers": [
         ["KC_A", "KC_B", "KC_C", "KC_D"]
diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json
index 845fff0dfba..040881546c1 100644
--- a/keyboards/handwired/technicpad/keymaps/via/keymap.json
+++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json
@@ -1,5 +1,5 @@
 {
-    "keyboard": "technicpad",
+    "keyboard": "handwired/technicpad",
     "keymap": "via",
     "config": {
         "features": {
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 5b0dc9f3839..e6d8bb6f052 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -201,11 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // Cases to switch default layer to QWERTY, COLEMAK or DVORAK and to access ADJUST layer
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 321202383f6..aa01e763eb4 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -18,6 +18,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3",
         "bootmagic": {
             "matrix": [4, 5]
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index aabe18457a7..0b23bdc61ff 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -15,5 +15,3 @@ RGB_MATRIX_ENABLE = no
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index a0c3ee0f4e4..24263fa832c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "tractyl_manuform.h"
 
 void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index eaaf00bbbd9..c9fe6e89cff 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -5,6 +5,7 @@
         "device_version": "0.0.1"
     },
     "split": {
+        "enabled": true,
         "bootmagic": {
             "matrix": [6, 5]
         }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index a689be3dd5a..220a361a4cc 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
@@ -16,6 +16,4 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSE_SHARED_EP = yes
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = handwired/tractyl_manuform/5x6_right/teensy2pp
diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json
index 171ae7bb027..fc1cfc90b72 100644
--- a/keyboards/handwired/unk/rev1/keyboard.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -20,6 +20,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
index c8a36bee0f2..a03f28dbf5f 100644
--- a/keyboards/handwired/unk/rules.mk
+++ b/keyboards/handwired/unk/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json
index b8b45e5ee14..001cd82074c 100644
--- a/keyboards/handwired/xealous/rev1/keyboard.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -17,6 +17,9 @@
     "rows": ["B5", "B4", "E6", "D7", "D4"]
   },
   "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index aff4db8cfd7..aa77674920d 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes        # Use shared split_common code
 
 SRC += matrix.c
 
diff --git a/keyboards/hazel/bad_wings/matrix.c b/keyboards/hazel/bad_wings/matrix.c
index 496bebd58f9..8a56a927c15 100644
--- a/keyboards/hazel/bad_wings/matrix.c
+++ b/keyboards/hazel/bad_wings/matrix.c
@@ -2,12 +2,11 @@
 // Copyright 2023 @jasonhazel (Jason Hazel)
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "quantum.h"
-#include "spi_master.h"
-#include <string.h> /* memset */
-#include <unistd.h> /* close */
-#include "quantum.h"
 #include "matrix.h"
+#include <string.h>
+#include "spi_master.h"
+#include "debug.h"
+#include "wait.h"
 
 #if (!defined(SHIFTREG_MATRIX_COL_CS))
 #    error Missing shift register I/O pin definitions
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index 953cc2ea101..d4fabc756e4 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.2"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "tapping": {
diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c
index 3ee620360d8..6684890f72b 100644
--- a/keyboards/helix/pico/keymaps/default/keymap.c
+++ b/keyboards/helix/pico/keymaps/default/keymap.c
@@ -179,11 +179,6 @@ float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 bool TOG_STATUS = false;
 int RGB_current_mode;
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // Setting ADJUST layer RGB back to default
 void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -203,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -212,7 +207,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -221,7 +216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
index efa7ae4be57..e18b8fb0c45 100644
--- a/keyboards/helix/pico/rules.mk
+++ b/keyboards/helix/pico/rules.mk
@@ -1,5 +1,3 @@
-SPLIT_KEYBOARD = yes
-
 # Helix Spacific Build Options default values
 LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk
index 4ed0672a708..066fffb74af 100644
--- a/keyboards/helix/pico/sc/rules.mk
+++ b/keyboards/helix/pico/sc/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index aac3cc9dbb1..fd829782c02 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "transport": {
             "sync": {
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index f23ff07b4fc..15bf4e86af6 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -191,11 +191,6 @@ float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 bool TOG_STATUS = false;
 int RGB_current_mode;
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 // Setting ADJUST layer RGB back to default
 void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -215,7 +210,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -224,7 +219,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -233,7 +228,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 7897a5b1e66..83029d1e0b7 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -1,5 +1,3 @@
-SPLIT_KEYBOARD = yes
-
 LTO_ENABLE = yes  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
index 4ca86c4f99e..b4f8e27de4d 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@@ -1,5 +1,4 @@
 LTO_ENABLE = no  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
 
 # Helix Spacific Build Options
 # you can uncomment and edit follows 7 Variables
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 98df1f45e82..5aa9439f4c1 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -5,7 +5,6 @@
 #   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
 #   See TOP/docs/config_options.md for more information.
 #
-SPLIT_KEYBOARD = yes
 
 LTO_ENABLE = no  # if firmware size over limit, try this option
 
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index 03396029a3d..e827ae111f1 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -1,7 +1,5 @@
 KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk
 
-SPLIT_KEYBOARD = yes
-
 # Helix Spacific Build Options default values
 OLED_ENABLE = yes           # OLED_ENABLE
 LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk
index 4ed0672a708..066fffb74af 100644
--- a/keyboards/helix/rev2/sc/rules.mk
+++ b/keyboards/helix/rev2/sc/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
 LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index a1752d01236..ce7bcde3e03 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -26,6 +26,7 @@
     ]
   },
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "ws2812": {
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index a46f9d9c59f..01251cd7807 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -1,6 +1,5 @@
 EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 57d4e11dfe5..e867f033262 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -92,6 +92,7 @@
     ]
   },
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "ws2812": {
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 921558e80d9..28fa314a7ba 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "rev3_5rows.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index 7cd934ebc4e..d1972faa1b3 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -1,6 +1,5 @@
 EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 OLED_ENABLE = yes
 ENCODER_ENABLE = yes
diff --git a/keyboards/hhkb/yang/matrix.c b/keyboards/hhkb/yang/matrix.c
index f0eccc899dc..c82c77bed34 100644
--- a/keyboards/hhkb/yang/matrix.c
+++ b/keyboards/hhkb/yang/matrix.c
@@ -16,7 +16,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "debug.h"
+#include "timer.h"
+#include "wait.h"
+#include "suspend.h"
+#include <avr/interrupt.h>
 
 #ifdef BLUETOOTH_ENABLE
 #    include "adafruit_ble.h"
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
deleted file mode 100644
index ee43e96bdd0..00000000000
--- a/keyboards/hidtech/bastyl/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "Bastyl",
-    "manufacturer": "HID Technologies",
-    "url": "https://www.hidtech.ca/?product=bastyl-black",
-    "maintainer": "HID-Technologies",
-    "usb": {
-        "vid": "0xA8F7",
-        "pid": "0x1827",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
-        "rows": ["D7", "B5", "F7", "F6", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "ws2812": {
-        "pin": "D2"
-    },
-    "rgblight": {
-        "led_count": 38,
-        "split": 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
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 1], "x": 15, "y": 0},
-                {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1},
-                {"matrix": [6, 1], "x": 15, "y": 1},
-                {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2},
-                {"matrix": [7, 1], "x": 15, "y": 2},
-                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-
-                {"matrix": [4, 3], "x": 5, "y": 4},
-                {"matrix": [4, 4], "x": 6, "y": 4},
-                {"matrix": [4, 1], "x": 7, "y": 4},
-
-                {"matrix": [9, 1], "x": 9, "y": 4},
-                {"matrix": [9, 4], "x": 10, "y": 4},
-                {"matrix": [9, 3], "x": 11, "y": 4},
-
-                {"matrix": [4, 5], "x": 6, "y": 5},
-                {"matrix": [4, 2], "x": 7, "y": 5},
-
-                {"matrix": [9, 2], "x": 9, "y": 5},
-                {"matrix": [9, 5], "x": 10, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/hidtech/bastyl/keyboard.json b/keyboards/hidtech/bastyl/keyboard.json
new file mode 100644
index 00000000000..5c3a9fcfcff
--- /dev/null
+++ b/keyboards/hidtech/bastyl/keyboard.json
@@ -0,0 +1,125 @@
+{
+    "keyboard_name": "Bastyl",
+    "manufacturer": "HID Technologies",
+    "url": "https://www.hidtech.ca/?product=bastyl-black",
+    "maintainer": "HID-Technologies",
+    "usb": {
+        "vid": "0xA8F7",
+        "pid": "0x1827",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+        "rows": ["D7", "B5", "F7", "F6", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "ws2812": {
+        "pin": "D2"
+    },
+    "rgblight": {
+        "led_count": 38,
+        "split": 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
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 1], "x": 15, "y": 1},
+                {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 3], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [4, 1], "x": 7, "y": 4},
+
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+
+                {"matrix": [4, 5], "x": 6, "y": 5},
+                {"matrix": [4, 2], "x": 7, "y": 5},
+
+                {"matrix": [9, 2], "x": 9, "y": 5},
+                {"matrix": [9, 5], "x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk
deleted file mode 100644
index 323b24ba201..00000000000
--- a/keyboards/hidtech/bastyl/rules.mk
+++ /dev/null
@@ -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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
index 7512debabdf..6dd45b06f08 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/info.json
@@ -22,6 +22,7 @@
         "rgblight": true
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
index 3c12e55b581..093b81abfe0 100644
--- a/keyboards/hillside/46/0_1/rules.mk
+++ b/keyboards/hillside/46/0_1/rules.mk
@@ -1,4 +1,3 @@
-SPLIT_KEYBOARD = yes        # Use shared split_common code
 LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 
 # If you add a haptic board,
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
index b6007f1f729..4f565f5cdc6 100644
--- a/keyboards/hillside/48/0_1/info.json
+++ b/keyboards/hillside/48/0_1/info.json
@@ -22,6 +22,7 @@
         "rgblight": true
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
index 3c12e55b581..093b81abfe0 100644
--- a/keyboards/hillside/48/0_1/rules.mk
+++ b/keyboards/hillside/48/0_1/rules.mk
@@ -1,4 +1,3 @@
-SPLIT_KEYBOARD = yes        # Use shared split_common code
 LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 
 # If you add a haptic board,
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
index 63bbf3b2577..2064ba617cc 100644
--- a/keyboards/hillside/52/0_1/info.json
+++ b/keyboards/hillside/52/0_1/info.json
@@ -22,6 +22,7 @@
         "rgblight": true
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
index 3c12e55b581..093b81abfe0 100644
--- a/keyboards/hillside/52/0_1/rules.mk
+++ b/keyboards/hillside/52/0_1/rules.mk
@@ -1,4 +1,3 @@
-SPLIT_KEYBOARD = yes        # Use shared split_common code
 LTO_ENABLE = yes            # Use link time optimization for smaller firmware
 
 # If you add a haptic board,
diff --git a/keyboards/hineybush/hbcp/matrix.c b/keyboards/hineybush/hbcp/matrix.c
index d493a7e9ef6..69ae6ab7b78 100644
--- a/keyboards/hineybush/hbcp/matrix.c
+++ b/keyboards/hineybush/hbcp/matrix.c
@@ -14,12 +14,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 static const pin_t row_pins[] = MATRIX_ROW_PINS;
 static const pin_t col_pins[] = MATRIX_COL_PINS;
diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
index 6510223b222..70699ff3cda 100644
--- a/keyboards/horrortroll/handwired_k552/lib/bongocat.c
+++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
 
 // WPM-responsive animation stuff here
 # define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
 # define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
 # define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
-# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
 
 uint32_t curr_anim_duration = 0; // variable animation duration
 uint32_t bongo_timer = 0;
diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
index 04885b80859..6578295c6f0 100644
--- a/keyboards/horrortroll/handwired_k552/lib/galaxy.c
+++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "galaxy.h"
+#include "oled_driver.h"
+#include "progmem.h"
 
 # define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
 
diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c
index 3931fdf4554..f3ae2f8a068 100644
--- a/keyboards/horrortroll/handwired_k552/lib/logo.c
+++ b/keyboards/horrortroll/handwired_k552/lib/logo.c
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "logo.h"
+#include "oled_driver.h"
+#include "progmem.h"
 
 # define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
 
diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.c b/keyboards/horrortroll/lemon40/lib/bongocat.c
index 12ca8694c1d..c90df38aec0 100644
--- a/keyboards/horrortroll/lemon40/lib/bongocat.c
+++ b/keyboards/horrortroll/lemon40/lib/bongocat.c
@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
 
 // WPM-responsive animation stuff here
 #define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
 #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
 #define ANIM_SIZE 525  // number of bytes in array, minimize for adequate firmware size, max is 1024
-#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
 
 uint32_t curr_anim_duration = 0; // variable animation duration
 uint32_t bongo_timer = 0;
diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/rev1.c
similarity index 100%
rename from keyboards/horrortroll/nyx/rev1/nyx.c
rename to keyboards/horrortroll/nyx/rev1/rev1.c
diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c
index 00af9efb1e5..4e86ec6d18b 100644
--- a/keyboards/hotdox/hotdox.c
+++ b/keyboards/hotdox/hotdox.c
@@ -1,6 +1,4 @@
 #include "hotdox.h"
-#include "backlight.h"
-#include "quantum.h"
 
 extern inline void ergodox_board_led_on(void);
 extern inline void ergodox_right_led_1_on(void);
diff --git a/keyboards/hotdox/left.c b/keyboards/hotdox/left.c
index 5196fb3115e..ac513224767 100644
--- a/keyboards/hotdox/left.c
+++ b/keyboards/hotdox/left.c
@@ -1,5 +1,6 @@
 #include "action.h"
 #include "left.h"
+#include "print.h"
 #include "wait.h"
 
 bool i2c_initialized = false;
diff --git a/keyboards/hotdox/left.h b/keyboards/hotdox/left.h
index 32faadba219..931d98d8e56 100644
--- a/keyboards/hotdox/left.h
+++ b/keyboards/hotdox/left.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include "quantum.h"
 #include <stdint.h>
 #include "i2c_master.h"
-#include <util/delay.h>
 
 #define MCP23017
 #define MCP23017_A0 0
@@ -43,8 +41,6 @@ void left_scan(void);
 uint8_t left_read_cols(void);
 uint8_t left_get_col(uint8_t col);
 
-matrix_row_t left_read_row(void);
-
 void left_unselect_rows(void);
 void left_select_row(uint8_t row);
 
diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index bc8cb00131d..96e559f742e 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index bc8cb00131d..96e559f742e 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index bc8cb00131d..96e559f742e 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c
index 361803edec4..85df5e5d6fa 100644
--- a/keyboards/ibm/model_m/mschwingen/matrix.c
+++ b/keyboards/ibm/model_m/mschwingen/matrix.c
@@ -14,12 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdint.h>
-#include <stdbool.h>
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 #include "spi_master.h"
 #include "print.h"
 #include "mschwingen.h"
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 081dd8ddd5d..862b6323b02 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
index ff66487bad9..2382d570350 100644
--- a/keyboards/ibnuda/squiggle/rev1/rules.mk
+++ b/keyboards/ibnuda/squiggle/rev1/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c
index 03a31e68049..9b7e481d682 100644
--- a/keyboards/idobao/id61/keymaps/idobao/specialk.c
+++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "specialk.h"
+#include "keycodes.h"
+#include "action_layer.h"
+#include "action_util.h"
 
 bool delkey_registered = false;
 uint32_t __keycode_raised = 0;
diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.h b/keyboards/idobao/id61/keymaps/idobao/specialk.h
index a2ec124de8a..a79cde5953f 100644
--- a/keyboards/idobao/id61/keymaps/idobao/specialk.h
+++ b/keyboards/idobao/id61/keymaps/idobao/specialk.h
@@ -5,8 +5,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "util.h"
-#include "quantum.h"
+#include "action.h"
 
 bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr);
 bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index d2d1e73943a..51bf7a5f126 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -38,6 +38,9 @@
         "rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
     },
     "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true
+    },
     "processor": "MK20DX256",
     "bootloader": "kiibohd",
     "board": "IC_TEENSY_3_1",
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 35f459fab5f..48b26c704ee 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -233,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_DOWN, KC_KP_4, KC_KP_5,  KC_KP_6,  KC_KP_MINUS, KC_KP_ENTER,
        KC_NO,KC_AMPR,KC_KP_1, KC_KP_2,  KC_KP_3,   KC_KP_PLUS, KC_NO,
                          KC_TRNS,KC_DOT,  KC_0,    KC_KP_EQUAL,  KC_NO,
-       BL_OFF, KC_TRNS,
-       BL_ON,
+       LM_OFF, KC_TRNS,
+       LM_ON,
        KC_NO, KC_NO, LT(HALFSYMB, KC_ENT)
 ),
 /* Keymap 6: Mirrored Symbol Layer
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index 4f1b0c01881..da68a7f25d1 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -13,7 +13,6 @@ SLEEP_LED_ENABLE = yes
 
 RGBLIGHT_ENABLE = no
 
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 
 ST7565_ENABLE = yes
diff --git a/keyboards/input_club/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
index e25ae2ef6f1..a55b2fb38ce 100644
--- a/keyboards/input_club/k_type/i2c_master.c
+++ b/keyboards/input_club/k_type/i2c_master.c
@@ -27,10 +27,11 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-
-#include "quantum.h"
 #include "i2c_master.h"
+#include "gpio.h"
+#include "chibios_config.h"
 #include <string.h>
+#include <ch.h>
 #include <hal.h>
 
 static uint8_t i2c_address;
diff --git a/keyboards/jadookb/jkb65/keymaps/default/keymap.c b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
index 22016cea763..14055736cdb 100644
--- a/keyboards/jadookb/jkb65/keymaps/default/keymap.c
+++ b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
@@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,     RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,             _______,
         _______,            _______,   _______,  _______, _______,  _______, _______, _______, _______, _______,  _______,  _______, RGB_VAI,        _______,
-        MAGIC_UNNO_GUI,MAGIC_NO_GUI,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
+        GU_ON, GU_OFF,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
     )
 };
diff --git a/keyboards/jadookb/jkb65/keymaps/via/keymap.c b/keyboards/jadookb/jkb65/keymaps/via/keymap.c
index 950410d1aff..d96f2bbce3d 100644
--- a/keyboards/jadookb/jkb65/keymaps/via/keymap.c
+++ b/keyboards/jadookb/jkb65/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,     RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
         _______,       _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,             _______,
         _______,            _______,   _______,  _______, _______,  _______, _______, _______, _______, _______,  _______,  _______, RGB_VAI,        _______,
-        MAGIC_UNNO_GUI,MAGIC_NO_GUI,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
+        GU_ON, GU_OFF,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
     ),
 	[2] = LAYOUT_65_ansi_blocker(
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
index 947cf020389..a0c271ea25c 100644
--- a/keyboards/jian/handwired/rules.mk
+++ b/keyboards/jian/handwired/rules.mk
@@ -1,6 +1,5 @@
 # Build Options
 #   change yes to no to disable
 #
-SPLIT_KEYBOARD = no
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
index 3d0af8ae989..a05436d218b 100644
--- a/keyboards/jian/nsrev2/rules.mk
+++ b/keyboards/jian/nsrev2/rules.mk
@@ -2,6 +2,5 @@
 #   change yes to no to disable
 #
 CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = no
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index 68a6efe47b1..3cfc0266670 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "split": {
+        "enabled": true
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
         "rows": ["D3", "D2", "E6", "B4"]
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
index 33588c1755e..bd3228c26eb 100644
--- a/keyboards/jian/rev1/rules.mk
+++ b/keyboards/jian/rev1/rules.mk
@@ -2,7 +2,6 @@
 #   change yes to no to disable
 #
 CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index cfcfc8e2fa4..ebd015c9a4a 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -38,6 +38,7 @@
         "esc_output": "D3"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D1"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
index 8e6da2d84f0..e8415063bc2 100644
--- a/keyboards/jian/rev2/rules.mk
+++ b/keyboards/jian/rev2/rules.mk
@@ -2,6 +2,5 @@
 #   change yes to no to disable
 #
 CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 0332657ffc6..061ac2cc7c6 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
      "split": {
+        "enabled": true,
         "soft_serial_pin": "D1"
      },
     "processor": "atmega32u4",
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
index b4c74a089dc..d1450315061 100644
--- a/keyboards/jiran/rules.mk
+++ b/keyboards/jiran/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = jiran/rev1
diff --git a/keyboards/jones/v03/matrix.c b/keyboards/jones/v03/matrix.c
index efcd7043e64..445c1acdc07 100644
--- a/keyboards/jones/v03/matrix.c
+++ b/keyboards/jones/v03/matrix.c
@@ -14,10 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 
 #define ROW_SHIFTER ((uint16_t)1)
 
diff --git a/keyboards/jones/v03_1/matrix.c b/keyboards/jones/v03_1/matrix.c
index efcd7043e64..445c1acdc07 100644
--- a/keyboards/jones/v03_1/matrix.c
+++ b/keyboards/jones/v03_1/matrix.c
@@ -14,10 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 
 #define ROW_SHIFTER ((uint16_t)1)
 
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index f76b9c0e7d9..fedab8fd08a 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "transport": {
             "sync": {
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk
index 60e4f7b0dee..fb1b47d1065 100644
--- a/keyboards/jorne/rules.mk
+++ b/keyboards/jorne/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no          # Audio output
-SPLIT_KEYBOARD = yes       # Split common
 LTO_ENABLE     = yes
 
 DEFAULT_FOLDER = jorne/rev1
diff --git a/keyboards/joshajohnson/hub16/matrix.c b/keyboards/joshajohnson/hub16/matrix.c
index 4f32070e66e..0fe1d41dad8 100644
--- a/keyboards/joshajohnson/hub16/matrix.c
+++ b/keyboards/joshajohnson/hub16/matrix.c
@@ -14,12 +14,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
-#include "quantum.h"
 
 // Encoder things
 #define SWITCH_1 F7
diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c
index bdf509a8e89..156fb77d697 100644
--- a/keyboards/jukaie/jk01/keymaps/default/keymap.c
+++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c
index bdf509a8e89..156fb77d697 100644
--- a/keyboards/jukaie/jk01/keymaps/via/keymap.c
+++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
-  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+  KC_TRNS,  GU_TOGG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
 
 [Macfn] = LAYOUT(
   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
deleted file mode 100644
index 6956ab4834b..00000000000
--- a/keyboards/junco/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "manufacturer": "Dane Skalski",
-    "keyboard_name": "Junco",
-    "url": "https://github.com/Daneski13/Junco",
-    "maintainer": "Daneski13",
-    "usb": {
-        "vid": "0x4413",
-        "pid": "0x4A13",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
-        "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "GP15",
-        "driver": "vendor"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "split_count": [37, 37]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP16", "pin_b": "GP17"},
-            {"pin_a": "GP14", "pin_b": "GP13"}
-        ]
-    },
-    "split": {
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "GP14", "pin_b": "GP13"},
-                    {"pin_a": "GP16", "pin_b": "GP17"}
-                ]
-            }
-        }
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "layouts": {
-        "LAYOUT_split4x6_r1": {
-            "layout": [
-                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45},
-                {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45},
-                {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3},
-                {"label": "8", "matrix": [5, 3], "x": 11, "y": 0},
-                {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3},
-                {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7},
-                {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7},
-                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7},
-                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3},
-                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3},
-                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45},
-                {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45},
-                {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3},
-                {"label": "I", "matrix": [6, 3], "x": 11, "y": 1},
-                {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3},
-                {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7},
-                {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7},
-
-                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7},
-                {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7},
-                {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3},
-                {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3},
-                {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45},
-                {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45},
-                {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3},
-                {"label": "K", "matrix": [7, 3], "x": 11, "y": 2},
-                {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3},
-                {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7},
-                {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7},
-                {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7},
-                {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3},
-                {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
-                {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3},
-                {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45},
-                {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45},
-                {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45},
-                {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45},
-                {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3},
-                {"label": ",", "matrix": [8, 3], "x": 11, "y": 3},
-                {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3},
-                {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7},
-                {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3},
-                {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3},
-                {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5},
-                {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5},
-                {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5},
-                {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5},
-                {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3},
-                {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4},
-                {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/junco/rev1/keyboard.json b/keyboards/junco/rev1/keyboard.json
new file mode 100644
index 00000000000..855628d3b1c
--- /dev/null
+++ b/keyboards/junco/rev1/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "manufacturer": "Dane Skalski",
+    "keyboard_name": "Junco",
+    "url": "https://github.com/Daneski13/Junco",
+    "maintainer": "Daneski13",
+    "usb": {
+        "vid": "0x4413",
+        "pid": "0x4A13",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
+        "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [37, 37]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP16", "pin_b": "GP17"},
+            {"pin_a": "GP14", "pin_b": "GP13"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP14", "pin_b": "GP13"},
+                    {"pin_a": "GP16", "pin_b": "GP17"}
+                ]
+            }
+        }
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "layouts": {
+        "LAYOUT_split4x6_r1": {
+            "layout": [
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45},
+                {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45},
+                {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3},
+                {"label": "8", "matrix": [5, 3], "x": 11, "y": 0},
+                {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3},
+                {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7},
+                {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45},
+                {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45},
+                {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3},
+                {"label": "I", "matrix": [6, 3], "x": 11, "y": 1},
+                {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3},
+                {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7},
+                {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7},
+
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7},
+                {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7},
+                {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3},
+                {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3},
+                {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45},
+                {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45},
+                {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3},
+                {"label": "K", "matrix": [7, 3], "x": 11, "y": 2},
+                {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3},
+                {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7},
+                {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7},
+                {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7},
+                {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3},
+                {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3},
+                {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45},
+                {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45},
+                {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45},
+                {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45},
+                {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3},
+                {"label": ",", "matrix": [8, 3], "x": 11, "y": 3},
+                {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3},
+                {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7},
+                {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3},
+                {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3},
+                {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5},
+                {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5},
+                {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5},
+                {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5},
+                {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3},
+                {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index e69de29bb2d..161ec22b16e 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk
index a04c7822f91..bb94741e5ad 100644
--- a/keyboards/junco/rules.mk
+++ b/keyboards/junco/rules.mk
@@ -1,9 +1 @@
-# Split Keyboard Stuff
-SPLIT_KEYBOARD = yes
-SERIAL_DRIVER = vendor
-
-# Enable Bootmagic Lite
-BOOTMAGIC_ENABLE = yes
-
-# Default Folder
 DEFAULT_FOLDER = junco/rev1
diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c
index 34e57a88741..2834f7625b8 100644
--- a/keyboards/kagizaraya/chidori/board.c
+++ b/keyboards/kagizaraya/chidori/board.c
@@ -19,7 +19,6 @@
 #include "print.h"
 #include "debug.h"
 #include "matrix.h"
-#include "quantum.h"
 #include "board.h"
 #include "i2c_master.h"
 
diff --git a/keyboards/kagizaraya/chidori/matrix.c b/keyboards/kagizaraya/chidori/matrix.c
index 6228125d923..e506916f389 100644
--- a/keyboards/kagizaraya/chidori/matrix.c
+++ b/keyboards/kagizaraya/chidori/matrix.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "board.h"
 
diff --git a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
index ecc0e328a7b..27f54ce7c12 100644
--- a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
@@ -25,8 +25,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
index a5c017336a4..500e3a93a4a 100644
--- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
@@ -25,8 +25,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
deleted file mode 100644
index 9b7f3104a0c..00000000000
--- a/keyboards/kagizaraya/miniaxe/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "MiniAxe",
-    "manufacturer": "ENDO Katsuhiro",
-    "url": "",
-    "maintainer": "ka2hiro",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3939",
-        "device_version": "0.0.1"
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "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": "F4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "matrix_pins": {
-        "direct": [
-            ["F1", "E6", "B0", "B2", "B3"],
-            ["F5", "F0", "B1", "B7", "D2"],
-            ["F6", "F7", "C7", "D5", "D3"],
-            ["B5", "C6", "B6", null, null]
-        ]
-    },
-    "community_layouts": ["split_3x5_3"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_split_3x5_3"
-    },
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "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": 4, "y": 0, "matrix": [0, 4]},
-
-                {"x": 6, "y": 0, "matrix": [4, 0]},
-                {"x": 7, "y": 0, "matrix": [4, 1]},
-                {"x": 8, "y": 0, "matrix": [4, 2]},
-                {"x": 9, "y": 0, "matrix": [4, 3]},
-                {"x": 10, "y": 0, "matrix": [4, 4]},
-
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1, "matrix": [1, 3]},
-                {"x": 4, "y": 1, "matrix": [1, 4]},
-
-                {"x": 6, "y": 1, "matrix": [5, 0]},
-                {"x": 7, "y": 1, "matrix": [5, 1]},
-                {"x": 8, "y": 1, "matrix": [5, 2]},
-                {"x": 9, "y": 1, "matrix": [5, 3]},
-                {"x": 10, "y": 1, "matrix": [5, 4]},
-
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2, "matrix": [2, 3]},
-                {"x": 4, "y": 2, "matrix": [2, 4]},
-
-                {"x": 6, "y": 2, "matrix": [6, 0]},
-                {"x": 7, "y": 2, "matrix": [6, 1]},
-                {"x": 8, "y": 2, "matrix": [6, 2]},
-                {"x": 9, "y": 2, "matrix": [6, 3]},
-                {"x": 10, "y": 2, "matrix": [6, 4]},
-
-                {"x": 2, "y": 3, "matrix": [3, 0]},
-                {"x": 3, "y": 3, "matrix": [3, 1]},
-                {"x": 4, "y": 3, "matrix": [3, 2]},
-
-                {"x": 6, "y": 3, "matrix": [7, 0]},
-                {"x": 7, "y": 3, "matrix": [7, 1]},
-                {"x": 8, "y": 3, "matrix": [7, 2]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kagizaraya/miniaxe/keyboard.json b/keyboards/kagizaraya/miniaxe/keyboard.json
new file mode 100644
index 00000000000..fa9f4d79dfc
--- /dev/null
+++ b/keyboards/kagizaraya/miniaxe/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "MiniAxe",
+    "manufacturer": "ENDO Katsuhiro",
+    "url": "",
+    "maintainer": "ka2hiro",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3939",
+        "device_version": "0.0.1"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "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": "F4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F1", "E6", "B0", "B2", "B3"],
+            ["F5", "F0", "B1", "B7", "D2"],
+            ["F6", "F7", "C7", "D5", "D3"],
+            ["B5", "C6", "B6", null, null]
+        ]
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "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": 4, "y": 0, "matrix": [0, 4]},
+
+                {"x": 6, "y": 0, "matrix": [4, 0]},
+                {"x": 7, "y": 0, "matrix": [4, 1]},
+                {"x": 8, "y": 0, "matrix": [4, 2]},
+                {"x": 9, "y": 0, "matrix": [4, 3]},
+                {"x": 10, "y": 0, "matrix": [4, 4]},
+
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+
+                {"x": 6, "y": 1, "matrix": [5, 0]},
+                {"x": 7, "y": 1, "matrix": [5, 1]},
+                {"x": 8, "y": 1, "matrix": [5, 2]},
+                {"x": 9, "y": 1, "matrix": [5, 3]},
+                {"x": 10, "y": 1, "matrix": [5, 4]},
+
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+
+                {"x": 6, "y": 2, "matrix": [6, 0]},
+                {"x": 7, "y": 2, "matrix": [6, 1]},
+                {"x": 8, "y": 2, "matrix": [6, 2]},
+                {"x": 9, "y": 2, "matrix": [6, 3]},
+                {"x": 10, "y": 2, "matrix": [6, 4]},
+
+                {"x": 2, "y": 3, "matrix": [3, 0]},
+                {"x": 3, "y": 3, "matrix": [3, 1]},
+                {"x": 4, "y": 3, "matrix": [3, 2]},
+
+                {"x": 6, "y": 3, "matrix": [7, 0]},
+                {"x": 7, "y": 3, "matrix": [7, 1]},
+                {"x": 8, "y": 3, "matrix": [7, 2]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
index 81f8004e694..1957c0276ce 100644
--- a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
@@ -24,8 +24,7 @@ enum layer_names {
 };
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
index 8b4417f62d1..c162c12045b 100644
--- a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
+++ b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
@@ -24,8 +24,7 @@ enum layer_names {
 };
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
deleted file mode 100644
index ee687e87af2..00000000000
--- a/keyboards/kagizaraya/miniaxe/rules.mk
+++ /dev/null
@@ -1,15 +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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-DEBUG_ENABLE = no
-SPLIT_KEYBOARD = yes        # Use shared split_common code
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index 6603e790c45..0900eee5a6d 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -17,6 +17,7 @@
         "pin": "B7"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
index aa7fc332fe5..4b976051f32 100644
--- a/keyboards/kagizaraya/scythe/rules.mk
+++ b/keyboards/kagizaraya/scythe/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes        # Use shared split_common
 RGBLIGHT_SPLIT = yes
diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c
index 7abc50005b6..5d731b10683 100644
--- a/keyboards/kakunpc/angel64/alpha/matrix.c
+++ b/keyboards/kakunpc/angel64/alpha/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c
index 7abc50005b6..5d731b10683 100644
--- a/keyboards/kakunpc/angel64/rev1/matrix.c
+++ b/keyboards/kakunpc/angel64/rev1/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/kakunpc/choc_taro/matrix.c b/keyboards/kakunpc/choc_taro/matrix.c
index 02421551da5..4547f1a0479 100644
--- a/keyboards/kakunpc/choc_taro/matrix.c
+++ b/keyboards/kakunpc/choc_taro/matrix.c
@@ -14,10 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define ROW_SHIFTER ((uint8_t)1)
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
deleted file mode 100644
index ac7732e7ca5..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "rabbit_capture_plan",
-    "manufacturer": "kakunpc",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEB59",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 69,
-        "max_brightness": 200,
-        "sleep": true,
-        "split_count": [32, 37],
-        "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
-        }
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.41, "y": 0},
-                {"matrix": [0, 1], "x": 1.41, "y": 0},
-                {"matrix": [0, 2], "x": 2.72, "y": 0},
-                {"matrix": [0, 3], "x": 3.72, "y": 0},
-                {"matrix": [0, 4], "x": 4.72, "y": 0},
-                {"matrix": [0, 5], "x": 5.72, "y": 0},
-                {"matrix": [0, 6], "x": 6.72, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.62, "y": 0},
-                {"matrix": [5, 1], "x": 10.62, "y": 0},
-                {"matrix": [5, 2], "x": 11.62, "y": 0},
-                {"matrix": [5, 3], "x": 12.62, "y": 0},
-                {"matrix": [5, 4], "x": 14.07, "y": 0},
-                {"matrix": [5, 5], "x": 15.07, "y": 0},
-                {"matrix": [5, 6], "x": 16.07, "y": 0},
-                {"matrix": [5, 7], "x": 17.07, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.78, "y": 1},
-                {"matrix": [1, 2], "x": 3.22, "y": 1},
-                {"matrix": [1, 3], "x": 4.22, "y": 1},
-                {"matrix": [1, 4], "x": 5.22, "y": 1},
-                {"matrix": [1, 5], "x": 6.22, "y": 1},
-                {"matrix": [1, 6], "x": 7.22, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.12, "y": 1},
-                {"matrix": [6, 1], "x": 10.12, "y": 1},
-                {"matrix": [6, 2], "x": 11.12, "y": 1},
-                {"matrix": [6, 3], "x": 12.12, "y": 1},
-                {"matrix": [6, 4], "x": 13.72, "y": 1},
-                {"matrix": [6, 5], "x": 14.72, "y": 1},
-                {"matrix": [6, 6], "x": 15.72, "y": 1},
-                {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.89, "y": 2},
-                {"matrix": [2, 2], "x": 3.47, "y": 2},
-                {"matrix": [2, 3], "x": 4.47, "y": 2},
-                {"matrix": [2, 4], "x": 5.47, "y": 2},
-                {"matrix": [2, 5], "x": 6.47, "y": 2},
-                {"matrix": [4, 5], "x": 7.47, "y": 2},
-
-                {"matrix": [7, 0], "x": 9.37, "y": 2},
-                {"matrix": [7, 1], "x": 10.37, "y": 2},
-                {"matrix": [7, 2], "x": 11.37, "y": 2},
-                {"matrix": [7, 3], "x": 12.37, "y": 2},
-                {"matrix": [7, 4], "x": 14.09, "y": 2},
-                {"matrix": [7, 5], "x": 15.09, "y": 2},
-                {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.97, "y": 3},
-                {"matrix": [3, 3], "x": 4.97, "y": 3},
-                {"matrix": [3, 4], "x": 5.97, "y": 3},
-                {"matrix": [3, 5], "x": 6.97, "y": 3},
-
-                {"matrix": [8, 0], "x": 8.87, "y": 3},
-                {"matrix": [8, 1], "x": 9.87, "y": 3},
-                {"matrix": [8, 2], "x": 10.87, "y": 3},
-                {"matrix": [8, 3], "x": 11.87, "y": 3},
-                {"matrix": [8, 4], "x": 13.72, "y": 3},
-                {"matrix": [8, 5], "x": 14.72, "y": 3},
-                {"matrix": [8, 6], "x": 15.72, "y": 3},
-                {"matrix": [8, 7], "x": 16.72, "y": 3},
-
-                {"matrix": [9, 0], "x": 18, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4.47, "y": 4},
-                {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2},
-                {"matrix": [4, 4], "x": 7.47, "y": 4},
-
-                {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75},
-                {"matrix": [9, 2], "x": 12.1, "y": 4},
-
-                {"matrix": [9, 3], "x": 17, "y": 4.25},
-                {"matrix": [9, 4], "x": 18, "y": 4.25},
-                {"matrix": [9, 5], "x": 19, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/keyboard.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
new file mode 100644
index 00000000000..7667e5e41b1
--- /dev/null
+++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "rabbit_capture_plan",
+    "manufacturer": "kakunpc",
+    "url": "https://kakunpc.booth.pm/",
+    "maintainer": "kakunpc",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB59",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 69,
+        "max_brightness": 200,
+        "sleep": true,
+        "split_count": [32, 37],
+        "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
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.41, "y": 0},
+                {"matrix": [0, 1], "x": 1.41, "y": 0},
+                {"matrix": [0, 2], "x": 2.72, "y": 0},
+                {"matrix": [0, 3], "x": 3.72, "y": 0},
+                {"matrix": [0, 4], "x": 4.72, "y": 0},
+                {"matrix": [0, 5], "x": 5.72, "y": 0},
+                {"matrix": [0, 6], "x": 6.72, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.62, "y": 0},
+                {"matrix": [5, 1], "x": 10.62, "y": 0},
+                {"matrix": [5, 2], "x": 11.62, "y": 0},
+                {"matrix": [5, 3], "x": 12.62, "y": 0},
+                {"matrix": [5, 4], "x": 14.07, "y": 0},
+                {"matrix": [5, 5], "x": 15.07, "y": 0},
+                {"matrix": [5, 6], "x": 16.07, "y": 0},
+                {"matrix": [5, 7], "x": 17.07, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.78, "y": 1},
+                {"matrix": [1, 2], "x": 3.22, "y": 1},
+                {"matrix": [1, 3], "x": 4.22, "y": 1},
+                {"matrix": [1, 4], "x": 5.22, "y": 1},
+                {"matrix": [1, 5], "x": 6.22, "y": 1},
+                {"matrix": [1, 6], "x": 7.22, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.12, "y": 1},
+                {"matrix": [6, 1], "x": 10.12, "y": 1},
+                {"matrix": [6, 2], "x": 11.12, "y": 1},
+                {"matrix": [6, 3], "x": 12.12, "y": 1},
+                {"matrix": [6, 4], "x": 13.72, "y": 1},
+                {"matrix": [6, 5], "x": 14.72, "y": 1},
+                {"matrix": [6, 6], "x": 15.72, "y": 1},
+                {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.89, "y": 2},
+                {"matrix": [2, 2], "x": 3.47, "y": 2},
+                {"matrix": [2, 3], "x": 4.47, "y": 2},
+                {"matrix": [2, 4], "x": 5.47, "y": 2},
+                {"matrix": [2, 5], "x": 6.47, "y": 2},
+                {"matrix": [4, 5], "x": 7.47, "y": 2},
+
+                {"matrix": [7, 0], "x": 9.37, "y": 2},
+                {"matrix": [7, 1], "x": 10.37, "y": 2},
+                {"matrix": [7, 2], "x": 11.37, "y": 2},
+                {"matrix": [7, 3], "x": 12.37, "y": 2},
+                {"matrix": [7, 4], "x": 14.09, "y": 2},
+                {"matrix": [7, 5], "x": 15.09, "y": 2},
+                {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.97, "y": 3},
+                {"matrix": [3, 3], "x": 4.97, "y": 3},
+                {"matrix": [3, 4], "x": 5.97, "y": 3},
+                {"matrix": [3, 5], "x": 6.97, "y": 3},
+
+                {"matrix": [8, 0], "x": 8.87, "y": 3},
+                {"matrix": [8, 1], "x": 9.87, "y": 3},
+                {"matrix": [8, 2], "x": 10.87, "y": 3},
+                {"matrix": [8, 3], "x": 11.87, "y": 3},
+                {"matrix": [8, 4], "x": 13.72, "y": 3},
+                {"matrix": [8, 5], "x": 14.72, "y": 3},
+                {"matrix": [8, 6], "x": 15.72, "y": 3},
+                {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+                {"matrix": [9, 0], "x": 18, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.47, "y": 4},
+                {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 7.47, "y": 4},
+
+                {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75},
+                {"matrix": [9, 2], "x": 12.1, "y": 4},
+
+                {"matrix": [9, 3], "x": 17, "y": 4.25},
+                {"matrix": [9, 4], "x": 18, "y": 4.25},
+                {"matrix": [9, 5], "x": 19, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk
deleted file mode 100644
index 18499a95838..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/rules.mk
+++ /dev/null
@@ -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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = no
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
index 80475ea69aa..f777eaf8613 100644
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-SPLIT_KEYBOARD = no
 
 DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
index 8f624aeb6cf..c186263123b 100644
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
index 6da41b20b82..08f9eb20bd9 100644
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ b/keyboards/kakunpc/suihankey/split/rules.mk
@@ -1,4 +1,3 @@
 OLED_ENABLE = no
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = kakunpc/suihankey/split/rev1
diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c
index 7abc50005b6..5d731b10683 100644
--- a/keyboards/kakunpc/thedogkeyboard/matrix.c
+++ b/keyboards/kakunpc/thedogkeyboard/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 0d95b99e294..dbbfde0e2a4 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -60,6 +60,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2",
     "transport": {
       "sync": {
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
index e243d257030..586557a9637 100644
--- a/keyboards/kapl/rules.mk
+++ b/keyboards/kapl/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes       # Split common
 
 DEFAULT_FOLDER = kapl/rev1
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
index b1b1cc98551..0e32ab834bd 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk
index d8ff9ad313d..164c05712b1 100644
--- a/keyboards/kb58/rules.mk
+++ b/keyboards/kb58/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes        # Enables split keyboard support
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk
index d4493d25e0e..3d0767ea6d8 100644
--- a/keyboards/kbdfans/bella/rgb/rules.mk
+++ b/keyboards/kbdfans/bella/rgb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk
index d4493d25e0e..3d0767ea6d8 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rules.mk
+++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 AUDIO_ENABLE = no              # Audio output
 RGB_MATRIX_ENABLE = yes
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
deleted file mode 100644
index 9285255f36f..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "keyboard_name": "kbd67mkiirgb v2",
-    "usb": {
-        "pid": "0x1225",
-        "device_version": "0.0.2"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3731",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
-        "rows": ["F0", "F1", "F4", "E6", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
new file mode 100644
index 00000000000..561c4df2ac0
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "kbd67mkiirgb v2",
+    "usb": {
+        "pid": "0x1225",
+        "device_version": "0.0.2"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+        "rows": ["F0", "F1", "F4", "E6", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
deleted file mode 100644
index 05b460b165b..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
+++ /dev/null
@@ -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
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
deleted file mode 100644
index 7b64cae8934..00000000000
--- a/keyboards/kbdfans/maja/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "keyboard_name": "Maja",
-    "manufacturer": "KBDFans",
-    "url": "",
-    "maintainer": "DZTECH",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x6068",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3731",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
-        "rows": ["F0", "B6", "B5", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
-                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
-
-                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
-                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
-                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
-                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
-                {"matrix": [0, 11], "x": 12.75, "y": 0},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 13], "x": 14.75, "y": 0.25, "w": 2},
-
-                {"matrix": [0, 14], "x": 17.75, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1.25},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 17.75, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.25},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2.25},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 9, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 17.75, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 13], "x": 16.75, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.75, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.75, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.75, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/maja/keyboard.json b/keyboards/kbdfans/maja/keyboard.json
new file mode 100644
index 00000000000..c307f78637a
--- /dev/null
+++ b/keyboards/kbdfans/maja/keyboard.json
@@ -0,0 +1,151 @@
+{
+    "keyboard_name": "Maja",
+    "manufacturer": "KBDFans",
+    "url": "",
+    "maintainer": "DZTECH",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6068",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+        "rows": ["F0", "B6", "B5", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 17.75, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 13], "x": 16.75, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.75, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk
deleted file mode 100755
index d0606ec4ddd..00000000000
--- a/keyboards/kbdfans/maja/rules.mk
+++ /dev/null
@@ -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
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json
deleted file mode 100644
index 197f26870b8..00000000000
--- a/keyboards/kbdfans/maja_soldered/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "Maja Soldered",
-    "manufacturer": "KBDFans",
-    "url": "",
-    "maintainer": "DZTECH",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x6069",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
-        "rows": ["F0", "B6", "D6", "B4", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B5"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
-                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
-                {"matrix": [0, 2], "x": 2.75, "y": 0},
-                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
-                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
-
-                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
-                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
-                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
-                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
-                {"matrix": [0, 11], "x": 12.75, "y": 0},
-                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
-                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
-                {"matrix": [3, 14], "x": 15.75, "y": 0.25},
-
-                {"matrix": [0, 14], "x": 17.75, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 2, "y": 1.25},
-                {"matrix": [1, 2], "x": 3, "y": 1.25},
-                {"matrix": [1, 3], "x": 4, "y": 1.25},
-                {"matrix": [1, 4], "x": 5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6, "y": 1.25},
-
-                {"matrix": [1, 6], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
-                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 17.75, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 2, "y": 2.25},
-                {"matrix": [2, 2], "x": 3, "y": 2.25},
-                {"matrix": [2, 3], "x": 4, "y": 2.25},
-                {"matrix": [2, 4], "x": 5, "y": 2.25},
-                {"matrix": [2, 5], "x": 6, "y": 2.25},
-
-                {"matrix": [2, 6], "x": 9, "y": 2.25},
-                {"matrix": [2, 7], "x": 10, "y": 2.25},
-                {"matrix": [2, 8], "x": 11, "y": 2.25},
-                {"matrix": [2, 9], "x": 12, "y": 2.25},
-                {"matrix": [2, 10], "x": 13, "y": 2.25},
-                {"matrix": [2, 11], "x": 14, "y": 2.25},
-                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 17.75, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-
-                {"matrix": [3, 6], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
-
-                {"matrix": [3, 13], "x": 16.75, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
-                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.75, "y": 4.5},
-                {"matrix": [4, 13], "x": 16.75, "y": 4.5},
-                {"matrix": [4, 14], "x": 17.75, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/kbdfans/maja_soldered/keyboard.json b/keyboards/kbdfans/maja_soldered/keyboard.json
new file mode 100644
index 00000000000..f9ae338ae73
--- /dev/null
+++ b/keyboards/kbdfans/maja_soldered/keyboard.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "Maja Soldered",
+    "manufacturer": "KBDFans",
+    "url": "",
+    "maintainer": "DZTECH",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x6069",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+        "rows": ["F0", "B6", "D6", "B4", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B5"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+                {"matrix": [3, 14], "x": 15.75, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 17.75, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3, "y": 2.25},
+                {"matrix": [2, 3], "x": 4, "y": 2.25},
+                {"matrix": [2, 4], "x": 5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 13], "x": 16.75, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.75, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk
deleted file mode 100755
index ea875031b1f..00000000000
--- a/keyboards/kbdfans/maja_soldered/rules.mk
+++ /dev/null
@@ -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           # Audio output
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/keyboards/kbdfans/odin75/lib/bongocat.c b/keyboards/kbdfans/odin75/lib/bongocat.c
index 05be2173d15..9c7a5dc1fce 100644
--- a/keyboards/kbdfans/odin75/lib/bongocat.c
+++ b/keyboards/kbdfans/odin75/lib/bongocat.c
@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
 
 // WPM-responsive animation stuff here
 #define IDLE_FRAMES 5
diff --git a/keyboards/kbdmania/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c
index 65698670325..1843d19fd29 100644
--- a/keyboards/kbdmania/kmac/matrix.c
+++ b/keyboards/kbdmania/kmac/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header() print("\nr/c 01234567\n")
diff --git a/keyboards/kbdmania/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c
index 476e40f5144..ad7919e33cf 100644
--- a/keyboards/kbdmania/kmac_pad/matrix.c
+++ b/keyboards/kbdmania/kmac_pad/matrix.c
@@ -17,7 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "wait.h"
 #include "matrix.h"
-#include "quantum.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/rev1/keyboard.json
similarity index 100%
rename from keyboards/keaboard/info.json
rename to keyboards/keaboard/rev1/keyboard.json
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
deleted file mode 100644
index 5738ac69530..00000000000
--- a/keyboards/keebio/bfo9000/info.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-    "keyboard_name": "BFO-9000",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "Keebio",
-    "usb": {
-      "vid": "0xCB10",
-      "pid": "0x1169",
-      "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-      "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-      "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-      "led_count": 20,
-      "split_count": [10, 10]
-    },
-    "ws2812": {
-      "pin": "B4"
-    },
-    "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": [6, 0], "x": 10, "y": 0},
-          {"matrix": [6, 1], "x": 11, "y": 0},
-          {"matrix": [6, 2], "x": 12, "y": 0},
-          {"matrix": [6, 3], "x": 13, "y": 0},
-          {"matrix": [6, 4], "x": 14, "y": 0},
-          {"matrix": [6, 5], "x": 15, "y": 0},
-          {"matrix": [6, 6], "x": 16, "y": 0},
-          {"matrix": [6, 7], "x": 17, "y": 0},
-          {"matrix": [6, 8], "x": 18, "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": [7, 0], "x": 10, "y": 1},
-          {"matrix": [7, 1], "x": 11, "y": 1},
-          {"matrix": [7, 2], "x": 12, "y": 1},
-          {"matrix": [7, 3], "x": 13, "y": 1},
-          {"matrix": [7, 4], "x": 14, "y": 1},
-          {"matrix": [7, 5], "x": 15, "y": 1},
-          {"matrix": [7, 6], "x": 16, "y": 1},
-          {"matrix": [7, 7], "x": 17, "y": 1},
-          {"matrix": [7, 8], "x": 18, "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": [8, 0], "x": 10, "y": 2},
-          {"matrix": [8, 1], "x": 11, "y": 2},
-          {"matrix": [8, 2], "x": 12, "y": 2},
-          {"matrix": [8, 3], "x": 13, "y": 2},
-          {"matrix": [8, 4], "x": 14, "y": 2},
-          {"matrix": [8, 5], "x": 15, "y": 2},
-          {"matrix": [8, 6], "x": 16, "y": 2},
-          {"matrix": [8, 7], "x": 17, "y": 2},
-          {"matrix": [8, 8], "x": 18, "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": [9, 0], "x": 10, "y": 3},
-          {"matrix": [9, 1], "x": 11, "y": 3},
-          {"matrix": [9, 2], "x": 12, "y": 3},
-          {"matrix": [9, 3], "x": 13, "y": 3},
-          {"matrix": [9, 4], "x": 14, "y": 3},
-          {"matrix": [9, 5], "x": 15, "y": 3},
-          {"matrix": [9, 6], "x": 16, "y": 3},
-          {"matrix": [9, 7], "x": 17, "y": 3},
-          {"matrix": [9, 8], "x": 18, "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": [10, 0], "x": 10, "y": 4},
-          {"matrix": [10, 1], "x": 11, "y": 4},
-          {"matrix": [10, 2], "x": 12, "y": 4},
-          {"matrix": [10, 3], "x": 13, "y": 4},
-          {"matrix": [10, 4], "x": 14, "y": 4},
-          {"matrix": [10, 5], "x": 15, "y": 4},
-          {"matrix": [10, 6], "x": 16, "y": 4},
-          {"matrix": [10, 7], "x": 17, "y": 4},
-          {"matrix": [10, 8], "x": 18, "y": 4},
-
-          {"matrix": [5, 0], "x": 0, "y": 5},
-          {"matrix": [5, 1], "x": 1, "y": 5},
-          {"matrix": [5, 2], "x": 2, "y": 5},
-          {"matrix": [5, 3], "x": 3, "y": 5},
-          {"matrix": [5, 4], "x": 4, "y": 5},
-          {"matrix": [5, 5], "x": 5, "y": 5},
-          {"matrix": [5, 6], "x": 6, "y": 5},
-          {"matrix": [5, 7], "x": 7, "y": 5},
-          {"matrix": [5, 8], "x": 8, "y": 5},
-          {"matrix": [11, 0], "x": 10, "y": 5},
-          {"matrix": [11, 1], "x": 11, "y": 5},
-          {"matrix": [11, 2], "x": 12, "y": 5},
-          {"matrix": [11, 3], "x": 13, "y": 5},
-          {"matrix": [11, 4], "x": 14, "y": 5},
-          {"matrix": [11, 5], "x": 15, "y": 5},
-          {"matrix": [11, 6], "x": 16, "y": 5},
-          {"matrix": [11, 7], "x": 17, "y": 5},
-          {"matrix": [11, 8], "x": 18, "y": 5}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/keebio/bfo9000/keyboard.json b/keyboards/keebio/bfo9000/keyboard.json
new file mode 100644
index 00000000000..86fd59a5986
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keyboard.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "BFO-9000",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "Keebio",
+    "usb": {
+      "vid": "0xCB10",
+      "pid": "0x1169",
+      "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+      "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+      "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+      "enabled": true,
+      "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+      "led_count": 20,
+      "split_count": [10, 10]
+    },
+    "ws2812": {
+      "pin": "B4"
+    },
+    "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": [6, 0], "x": 10, "y": 0},
+          {"matrix": [6, 1], "x": 11, "y": 0},
+          {"matrix": [6, 2], "x": 12, "y": 0},
+          {"matrix": [6, 3], "x": 13, "y": 0},
+          {"matrix": [6, 4], "x": 14, "y": 0},
+          {"matrix": [6, 5], "x": 15, "y": 0},
+          {"matrix": [6, 6], "x": 16, "y": 0},
+          {"matrix": [6, 7], "x": 17, "y": 0},
+          {"matrix": [6, 8], "x": 18, "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": [7, 0], "x": 10, "y": 1},
+          {"matrix": [7, 1], "x": 11, "y": 1},
+          {"matrix": [7, 2], "x": 12, "y": 1},
+          {"matrix": [7, 3], "x": 13, "y": 1},
+          {"matrix": [7, 4], "x": 14, "y": 1},
+          {"matrix": [7, 5], "x": 15, "y": 1},
+          {"matrix": [7, 6], "x": 16, "y": 1},
+          {"matrix": [7, 7], "x": 17, "y": 1},
+          {"matrix": [7, 8], "x": 18, "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": [8, 0], "x": 10, "y": 2},
+          {"matrix": [8, 1], "x": 11, "y": 2},
+          {"matrix": [8, 2], "x": 12, "y": 2},
+          {"matrix": [8, 3], "x": 13, "y": 2},
+          {"matrix": [8, 4], "x": 14, "y": 2},
+          {"matrix": [8, 5], "x": 15, "y": 2},
+          {"matrix": [8, 6], "x": 16, "y": 2},
+          {"matrix": [8, 7], "x": 17, "y": 2},
+          {"matrix": [8, 8], "x": 18, "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": [9, 0], "x": 10, "y": 3},
+          {"matrix": [9, 1], "x": 11, "y": 3},
+          {"matrix": [9, 2], "x": 12, "y": 3},
+          {"matrix": [9, 3], "x": 13, "y": 3},
+          {"matrix": [9, 4], "x": 14, "y": 3},
+          {"matrix": [9, 5], "x": 15, "y": 3},
+          {"matrix": [9, 6], "x": 16, "y": 3},
+          {"matrix": [9, 7], "x": 17, "y": 3},
+          {"matrix": [9, 8], "x": 18, "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": [10, 0], "x": 10, "y": 4},
+          {"matrix": [10, 1], "x": 11, "y": 4},
+          {"matrix": [10, 2], "x": 12, "y": 4},
+          {"matrix": [10, 3], "x": 13, "y": 4},
+          {"matrix": [10, 4], "x": 14, "y": 4},
+          {"matrix": [10, 5], "x": 15, "y": 4},
+          {"matrix": [10, 6], "x": 16, "y": 4},
+          {"matrix": [10, 7], "x": 17, "y": 4},
+          {"matrix": [10, 8], "x": 18, "y": 4},
+
+          {"matrix": [5, 0], "x": 0, "y": 5},
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [5, 3], "x": 3, "y": 5},
+          {"matrix": [5, 4], "x": 4, "y": 5},
+          {"matrix": [5, 5], "x": 5, "y": 5},
+          {"matrix": [5, 6], "x": 6, "y": 5},
+          {"matrix": [5, 7], "x": 7, "y": 5},
+          {"matrix": [5, 8], "x": 8, "y": 5},
+          {"matrix": [11, 0], "x": 10, "y": 5},
+          {"matrix": [11, 1], "x": 11, "y": 5},
+          {"matrix": [11, 2], "x": 12, "y": 5},
+          {"matrix": [11, 3], "x": 13, "y": 5},
+          {"matrix": [11, 4], "x": 14, "y": 5},
+          {"matrix": [11, 5], "x": 15, "y": 5},
+          {"matrix": [11, 6], "x": 16, "y": 5},
+          {"matrix": [11, 7], "x": 17, "y": 5},
+          {"matrix": [11, 8], "x": 18, "y": 5}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk
deleted file mode 100644
index 743a54659e1..00000000000
--- a/keyboards/keebio/bfo9000/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index e826f34e329..cc3fe50636b 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -22,6 +22,7 @@
         "pin": "B5"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk
index 744acea63fe..b9c01e0aff0 100644
--- a/keyboards/keebio/foldkb/rules.mk
+++ b/keyboards/keebio/foldkb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = keebio/foldkb/rev1
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
deleted file mode 100644
index 8631fd58411..00000000000
--- a/keyboards/keebio/fourier/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "Fourier",
-    "manufacturer": "Keebio",
-    "url": "https://keeb.io",
-    "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "pid": "0x1247",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["F4", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "F4",
-        "esc_output": "F5",
-        "led": "B0",
-        "speaker": "C6"
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 14,
-        "split_count": [7, 7],
-        "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",
-    "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": [4, 0], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 4], "x": 11, "y": 0},
-                {"matrix": [4, 5], "x": 12, "y": 0},
-                {"matrix": [4, 6], "x": 13, "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": [5, 0], "x": 7.25, "y": 1},
-                {"matrix": [5, 1], "x": 8.25, "y": 1},
-                {"matrix": [5, 2], "x": 9.25, "y": 1},
-                {"matrix": [5, 3], "x": 10.25, "y": 1},
-                {"matrix": [5, 4], "x": 11.25, "y": 1},
-                {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75},
-
-                {"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": [6, 0], "x": 7.75, "y": 2},
-                {"matrix": [6, 2], "x": 8.75, "y": 2},
-                {"matrix": [6, 3], "x": 9.75, "y": 2},
-                {"matrix": [6, 4], "x": 10.75, "y": 2},
-                {"matrix": [6, 5], "x": 11.75, "y": 2},
-                {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25},
-
-                {"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, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25},
-                {"matrix": [7, 3], "x": 9.5, "y": 3},
-                {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3},
-                {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/fourier/keyboard.json b/keyboards/keebio/fourier/keyboard.json
new file mode 100644
index 00000000000..a1dab05c567
--- /dev/null
+++ b/keyboards/keebio/fourier/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Fourier",
+    "manufacturer": "Keebio",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "usb": {
+        "vid": "0xCB10",
+        "pid": "0x1247",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["F4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "F4",
+        "esc_output": "F5",
+        "led": "B0",
+        "speaker": "C6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 14,
+        "split_count": [7, 7],
+        "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",
+    "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": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+                {"matrix": [4, 6], "x": 13, "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": [5, 0], "x": 7.25, "y": 1},
+                {"matrix": [5, 1], "x": 8.25, "y": 1},
+                {"matrix": [5, 2], "x": 9.25, "y": 1},
+                {"matrix": [5, 3], "x": 10.25, "y": 1},
+                {"matrix": [5, 4], "x": 11.25, "y": 1},
+                {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75},
+
+                {"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": [6, 0], "x": 7.75, "y": 2},
+                {"matrix": [6, 2], "x": 8.75, "y": 2},
+                {"matrix": [6, 3], "x": 9.75, "y": 2},
+                {"matrix": [6, 4], "x": 10.75, "y": 2},
+                {"matrix": [6, 5], "x": 11.75, "y": 2},
+                {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25},
+
+                {"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, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 3], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk
deleted file mode 100644
index ff93a339143..00000000000
--- a/keyboards/keebio/fourier/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
deleted file mode 100644
index f5efce863a8..00000000000
--- a/keyboards/keebio/iris/rev1/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 1",
-    "usb": {
-        "pid": "0x1256",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "B5", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "driver": "timer",
-        "pin": "D2",
-        "levels": 5
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "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"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev1/keyboard.json b/keyboards/keebio/iris/rev1/keyboard.json
new file mode 100644
index 00000000000..c6b69c36778
--- /dev/null
+++ b/keyboards/keebio/iris/rev1/keyboard.json
@@ -0,0 +1,122 @@
+{
+    "keyboard_name": "Iris Rev. 1",
+    "usb": {
+        "pid": "0x1256",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "driver": "timer",
+        "pin": "D2",
+        "levels": 5
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "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"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk
deleted file mode 100644
index 12e5a0674bb..00000000000
--- a/keyboards/keebio/iris/rev1/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
deleted file mode 100644
index fb5db92913a..00000000000
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 1",
-    "usb": {
-        "pid": "0x1256",
-        "device_version": "1.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "F4"],
-        "rows": ["D7", "E6", "B4", "B5", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "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"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev1_led/keyboard.json b/keyboards/keebio/iris/rev1_led/keyboard.json
new file mode 100644
index 00000000000..70500da27e9
--- /dev/null
+++ b/keyboards/keebio/iris/rev1_led/keyboard.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Iris Rev. 1",
+    "usb": {
+        "pid": "0x1256",
+        "device_version": "1.1.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "F4"],
+        "rows": ["D7", "E6", "B4", "B5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "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"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk
deleted file mode 100644
index 12e5a0674bb..00000000000
--- a/keyboards/keebio/iris/rev1_led/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index aa41d0ebffa..bbd6f97cf4a 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -14,6 +14,7 @@
         "levels": 5
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk
index 286733cc508..d7e69407a24 100644
--- a/keyboards/keebio/iris/rev2/rules.mk
+++ b/keyboards/keebio/iris/rev2/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 39bf9dcfb5c..5014519408f 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -44,6 +44,7 @@
         "speaker": "C6"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk
index 44c1c1fac3f..6f0bda4dcc0 100644
--- a/keyboards/keebio/iris/rev3/rules.mk
+++ b/keyboards/keebio/iris/rev3/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index cc01dab3ec6..6faf28ea447 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -44,6 +44,7 @@
         "speaker": "C6"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "encoder": {
             "right": {
diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk
index 02da189f9ea..55a08a2117b 100644
--- a/keyboards/keebio/iris/rev4/rules.mk
+++ b/keyboards/keebio/iris/rev4/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
deleted file mode 100644
index 4bb4554f7c0..00000000000
--- a/keyboards/keebio/iris/rev5/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "Iris Rev. 5a",
-    "usb": {
-        "pid": "0x5356",
-        "device_version": "5.1.0"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
-        "rows": ["B1", "F0", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B3"}
-        ]
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 5,
-        "default": {
-            "brightness": 3
-        }
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 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
-        },
-        "default": {
-            "val": 128
-        }
-    },
-    "ws2812": {
-        "pin": "D6"
-    },
-    "qmk_lufa_bootloader": {
-        "esc_input": "B1",
-        "esc_output": "F1",
-        "led": "B0",
-        "speaker": "C6"
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F7", "pin_b": "F6"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
-                "rows": ["B1", "B2", "D2", "F1", "F4"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 5], "x": 9, "y": 0.25},
-                {"matrix": [5, 4], "x": 10, "y": 0.125},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0.125},
-                {"matrix": [5, 1], "x": 13, "y": 0.375},
-                {"matrix": [5, 0], "x": 14, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [6, 5], "x": 9, "y": 1.25},
-                {"matrix": [6, 4], "x": 10, "y": 1.125},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1.125},
-                {"matrix": [6, 1], "x": 13, "y": 1.375},
-                {"matrix": [6, 0], "x": 14, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 9, "y": 2.25},
-                {"matrix": [7, 4], "x": 10, "y": 2.125},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2.125},
-                {"matrix": [7, 1], "x": 13, "y": 2.375},
-                {"matrix": [7, 0], "x": 14, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
-
-                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
-                {"matrix": [8, 5], "x": 9, "y": 3.25},
-                {"matrix": [8, 4], "x": 10, "y": 3.125},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3.125},
-                {"matrix": [8, 1], "x": 13, "y": 3.375},
-                {"matrix": [8, 0], "x": 14, "y": 3.375},
-
-                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
-                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
-
-                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
-                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
-                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/iris/rev5/keyboard.json b/keyboards/keebio/iris/rev5/keyboard.json
new file mode 100644
index 00000000000..a1f97a78311
--- /dev/null
+++ b/keyboards/keebio/iris/rev5/keyboard.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Iris Rev. 5a",
+    "usb": {
+        "pid": "0x5356",
+        "device_version": "5.1.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
+        "rows": ["B1", "F0", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 5,
+        "default": {
+            "brightness": 3
+        }
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 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
+        },
+        "default": {
+            "val": 128
+        }
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B1",
+        "esc_output": "F1",
+        "led": "B0",
+        "speaker": "C6"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F7", "pin_b": "F6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+                "rows": ["B1", "B2", "D2", "F1", "F4"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 9, "y": 0.25},
+                {"matrix": [5, 4], "x": 10, "y": 0.125},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0.125},
+                {"matrix": [5, 1], "x": 13, "y": 0.375},
+                {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 9, "y": 1.25},
+                {"matrix": [6, 4], "x": 10, "y": 1.125},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1.125},
+                {"matrix": [6, 1], "x": 13, "y": 1.375},
+                {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 9, "y": 2.25},
+                {"matrix": [7, 4], "x": 10, "y": 2.125},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2.125},
+                {"matrix": [7, 1], "x": 13, "y": 2.375},
+                {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+
+                {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+                {"matrix": [8, 5], "x": 9, "y": 3.25},
+                {"matrix": [8, 4], "x": 10, "y": 3.125},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3.125},
+                {"matrix": [8, 1], "x": 13, "y": 3.375},
+                {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+                {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+
+                {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+                {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk
deleted file mode 100644
index 8859d8f69ca..00000000000
--- a/keyboards/keebio/iris/rev5/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 8563ba64ab7..837bb4e0d06 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -84,6 +84,7 @@
         }
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
index 5cdaba9bcec..69d1764838d 100644
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index a7b81f9224b..a3f25202ce3 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -83,6 +83,7 @@
         }
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
index 5cdaba9bcec..69d1764838d 100644
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index da7fbfb40f5..939a7723485 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -42,6 +42,7 @@
         "pin": "E6"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "encoder": {
             "right": {
diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk
index 68661bd7dcf..c6a1e8d0d17 100644
--- a/keyboards/keebio/kbo5000/rules.mk
+++ b/keyboards/keebio/kbo5000/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = keebio/kbo5000/rev1
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index d7cbab9f451..29ae8be8cb5 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -6,6 +6,9 @@
   "usb": {
     "vid": "0xCB10"
   },
+  "split": {
+    "enabled": true
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "community_layouts": ["ortho_4x12"]
diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c
index 72da4addc31..bdc4a50827f 100644
--- a/keyboards/keebio/levinson/keymaps/default/keymap.c
+++ b/keyboards/keebio/levinson/keymaps/default/keymap.c
@@ -142,11 +142,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk
index 249f8878816..eab321ff014 100644
--- a/keyboards/keebio/levinson/rules.mk
+++ b/keyboards/keebio/levinson/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = keebio/levinson/rev2
diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c
index 8bf16240fb1..df399d355f1 100644
--- a/keyboards/keebio/nyquist/keymaps/default/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c
@@ -162,11 +162,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
index 6109661ffd1..7ed85044ca6 100644
--- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
@@ -11,7 +11,7 @@ extern keymap_config_t keymap_config;
 #define _DVORAK 2
 #define _LOWER 3
 #define _RAISE 4
-#define _ADJUST 16
+#define _ADJUST 5
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -159,11 +159,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
deleted file mode 100644
index cd729aa87b7..00000000000
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "keyboard_name": "Nyquist Rev. 1",
-    "usb": {
-        "pid": "0x1156",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_5x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        },
-        "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": [5, 5], "x": 7, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
-                {"matrix": [6, 4], "x": 8, "y": 1},
-                {"matrix": [6, 3], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
-                {"matrix": [7, 4], "x": 8, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
-                {"matrix": [8, 4], "x": 8, "y": 3},
-                {"matrix": [8, 3], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4},
-                {"matrix": [9, 4], "x": 8, "y": 4},
-                {"matrix": [9, 3], "x": 9, "y": 4},
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 1], "x": 11, "y": 4},
-                {"matrix": [9, 0], "x": 12, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/nyquist/rev1/keyboard.json b/keyboards/keebio/nyquist/rev1/keyboard.json
new file mode 100644
index 00000000000..717b49e9713
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev1/keyboard.json
@@ -0,0 +1,170 @@
+{
+    "keyboard_name": "Nyquist Rev. 1",
+    "usb": {
+        "pid": "0x1156",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        },
+        "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": [5, 5], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 0], "x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk
deleted file mode 100644
index 714a247e2bd..00000000000
--- a/keyboards/keebio/nyquist/rev1/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
deleted file mode 100644
index f6b80cb9460..00000000000
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-    "keyboard_name": "Nyquist Rev. 2",
-    "usb": {
-        "pid": "0x2156",
-        "device_version": "2.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B6",
-        "levels": 7
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_5x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 7, "y": 3},
-                {"matrix": [7, 4], "x": 8, "y": 3},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        },
-        "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": [5, 5], "x": 7, "y": 0},
-                {"matrix": [5, 4], "x": 8, "y": 0},
-                {"matrix": [5, 3], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
-                {"matrix": [6, 4], "x": 8, "y": 1},
-                {"matrix": [6, 3], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
-                {"matrix": [7, 4], "x": 8, "y": 2},
-                {"matrix": [7, 3], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
-                {"matrix": [8, 4], "x": 8, "y": 3},
-                {"matrix": [8, 3], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4},
-                {"matrix": [9, 4], "x": 8, "y": 4},
-                {"matrix": [9, 3], "x": 9, "y": 4},
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 1], "x": 11, "y": 4},
-                {"matrix": [9, 0], "x": 12, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/nyquist/rev2/keyboard.json b/keyboards/keebio/nyquist/rev2/keyboard.json
new file mode 100644
index 00000000000..435cdd189fc
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev2/keyboard.json
@@ -0,0 +1,176 @@
+{
+    "keyboard_name": "Nyquist Rev. 2",
+    "usb": {
+        "pid": "0x2156",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B6",
+        "levels": 7
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 7, "y": 3},
+                {"matrix": [7, 4], "x": 8, "y": 3},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        },
+        "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": [5, 5], "x": 7, "y": 0},
+                {"matrix": [5, 4], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
+                {"matrix": [6, 4], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
+                {"matrix": [7, 4], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
+                {"matrix": [8, 4], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "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": [9, 5], "x": 7, "y": 4},
+                {"matrix": [9, 4], "x": 8, "y": 4},
+                {"matrix": [9, 3], "x": 9, "y": 4},
+                {"matrix": [9, 2], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 0], "x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk
deleted file mode 100644
index 83432f0b5e6..00000000000
--- a/keyboards/keebio/nyquist/rev2/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
deleted file mode 100644
index 9b3cc6d15aa..00000000000
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-    "keyboard_name": "Nyquist Rev. 3",
-    "usb": {
-        "pid": "0x3156",
-        "device_version": "3.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
-        "rows": ["F0", "F5", "D7", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B5",
-        "levels": 7
-    },
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "split_count": [6, 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": "B4"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "qmk-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_5x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_5x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-
-                {"matrix": [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": [6, 0], "x": 7, "y": 1},
-                {"matrix": [6, 1], "x": 8, "y": 1},
-                {"matrix": [6, 2], "x": 9, "y": 1},
-                {"matrix": [6, 3], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
-                {"matrix": [7, 1], "x": 8, "y": 2},
-                {"matrix": [7, 2], "x": 9, "y": 2},
-                {"matrix": [7, 3], "x": 10, "y": 2},
-                {"matrix": [7, 4], "x": 11, "y": 2},
-                {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
-                {"matrix": [8, 1], "x": 8, "y": 3},
-                {"matrix": [8, 2], "x": 9, "y": 3},
-                {"matrix": [8, 3], "x": 10, "y": 3},
-                {"matrix": [8, 4], "x": 11, "y": 3},
-                {"matrix": [8, 5], "x": 12, "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": [9, 0], "x": 7, "y": 4},
-                {"matrix": [9, 1], "x": 8, "y": 4},
-                {"matrix": [9, 2], "x": 9, "y": 4},
-                {"matrix": [9, 3], "x": 10, "y": 4},
-                {"matrix": [9, 4], "x": 11, "y": 4},
-                {"matrix": [9, 5], "x": 12, "y": 4}
-            ]
-        },
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-
-                {"matrix": [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": [6, 0], "x": 7, "y": 1},
-                {"matrix": [6, 1], "x": 8, "y": 1},
-                {"matrix": [6, 2], "x": 9, "y": 1},
-                {"matrix": [6, 3], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
-                {"matrix": [7, 1], "x": 8, "y": 2},
-                {"matrix": [7, 2], "x": 9, "y": 2},
-                {"matrix": [7, 3], "x": 10, "y": 2},
-                {"matrix": [7, 4], "x": 11, "y": 2},
-                {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
-                {"matrix": [8, 1], "x": 8, "y": 3},
-                {"matrix": [8, 2], "x": 9, "y": 3},
-                {"matrix": [8, 3], "x": 10, "y": 3},
-                {"matrix": [8, 4], "x": 11, "y": 3},
-                {"matrix": [8, 5], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keebio/nyquist/rev3/keyboard.json b/keyboards/keebio/nyquist/rev3/keyboard.json
new file mode 100644
index 00000000000..80e5a10a17a
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev3/keyboard.json
@@ -0,0 +1,188 @@
+{
+    "keyboard_name": "Nyquist Rev. 3",
+    "usb": {
+        "pid": "0x3156",
+        "device_version": "3.0.0"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
+        "rows": ["F0", "F5", "D7", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B5",
+        "levels": 7
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "split_count": [6, 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": "B4"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+
+                {"matrix": [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": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "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": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+
+                {"matrix": [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": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk
deleted file mode 100644
index 83432f0b5e6..00000000000
--- a/keyboards/keebio/nyquist/rev3/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/quefrency/info.json b/keyboards/keebio/quefrency/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/keebio/quefrency/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
index cd165afef28..33c64f3d654 100644
--- a/keyboards/keebio/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -8,7 +8,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = keebio/quefrency/rev1
 LTO_ENABLE = yes
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 55fcae83873..22a5de3b931 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -38,6 +38,7 @@
     "pin": "D3"
   },
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
   "processor": "atmega32u4",
diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
index baf3beba146..59170f1516a 100644
--- a/keyboards/keebio/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = keebio/rorschach/rev1
diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index 1fadcce126f..8b1063ea98c 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -5,6 +5,9 @@
     "usb": {
         "vid": "0xCB10"
     },
+    "split": {
+        "enabled": true
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_5x14"]
diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk
index 2008e63b003..5192d5ba728 100644
--- a/keyboards/keebio/viterbi/rules.mk
+++ b/keyboards/keebio/viterbi/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = keebio/viterbi/rev2
diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c
index 72da4addc31..bdc4a50827f 100644
--- a/keyboards/keebio/wavelet/keymaps/default/keymap.c
+++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c
@@ -142,11 +142,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/keebwerk/mega/ansi/rules.mk b/keyboards/keebwerk/mega/ansi/rules.mk
index e257f3063ff..82d4a940ede 100755
--- a/keyboards/keebwerk/mega/ansi/rules.mk
+++ b/keyboards/keebwerk/mega/ansi/rules.mk
@@ -15,7 +15,6 @@ 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
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c
index 3fb502cb27d..656e176bfad 100644
--- a/keyboards/keyboardio/model01/leds.c
+++ b/keyboards/keyboardio/model01/leds.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+
+#include "leds.h"
 #include "i2c_master.h"
 #include "led_tables.h"
 #include "rgb_matrix.h"
diff --git a/keyboards/keyboardio/model01/leds.h b/keyboards/keyboardio/model01/leds.h
index 4d185919b00..6f5e12a6a84 100644
--- a/keyboards/keyboardio/model01/leds.h
+++ b/keyboards/keyboardio/model01/leds.h
@@ -15,8 +15,7 @@
  */
 #pragma once
 
-#include "quantum.h"
-#include "rgb_matrix.h"
+#include <stdint.h>
 
 void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
 void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c
index 4b788d28128..20359ca9718 100644
--- a/keyboards/keyboardio/model01/matrix.c
+++ b/keyboards/keyboardio/model01/matrix.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_master.h"
 #include <string.h>
 #include "model01.h"
diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c
index 3644f045163..33198423de6 100644
--- a/keyboards/keyboardio/model01/model01.c
+++ b/keyboards/keyboardio/model01/model01.c
@@ -13,10 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+
+#include "model01.h"
 #include "i2c_master.h"
 #include <string.h>
-#include "model01.h"
 
 void matrix_init_kb(void) {
   /* the bootloader can leave LEDs on, so */
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
index a829c118922..93dab79e7a1 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
index e17d67eb718..f819b4fc031 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,   BL_UP,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
index a829c118922..93dab79e7a1 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_tkl_ansi(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  _______,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_tkl_ansi(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c
index 2b41845c9b5..9009225b3b2 100644
--- a/keyboards/keychron/c1_pro/ansi/white/white.c
+++ b/keyboards/keychron/c1_pro/ansi/white/white.c
@@ -128,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
     switch (keycode) {
-        case BL_TOGG:
+        case LM_TOGG:
             if (record->event.pressed) {
                 switch (led_matrix_get_flags()) {
                     case LED_FLAG_ALL: {
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
index 70934e122e3..b8c26b19397 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [MAC_FN] = LAYOUT(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 
     [WIN_BASE] = LAYOUT(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [WIN_FN] = LAYOUT(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,   BL_UP,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 };
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
index 09002c3d7a4..c99b5bc4916 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [MAC_FN] = LAYOUT(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 
     [WIN_BASE] = LAYOUT(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_CRTA,  LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [WIN_FN] = LAYOUT(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 };
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
index 547521e099b..a162e3d3a5e 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    BL_STEP,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [MAC_FN] = LAYOUT(
-        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  BL_TOGG,
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 
     [WIN_BASE] = LAYOUT(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    BL_STEP,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_PSCR,  KC_NO,    LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
@@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
 
     [WIN_FN] = LAYOUT(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,   BL_UP,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ),
 };
diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c
index 5065f97aa7d..8c954c73d08 100644
--- a/keyboards/keychron/c2_pro/matrix.c
+++ b/keyboards/keychron/c2_pro/matrix.c
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "atomic_util.h"
+#include <string.h>
 
 #ifndef SHIFT_COL_START
 #    define SHIFT_COL_START 8
diff --git a/keyboards/keychron/q10/matrix.c b/keyboards/keychron/q10/matrix.c
index 5c035b0e42e..2c2d2ccc378 100644
--- a/keyboards/keychron/q10/matrix.c
+++ b/keyboards/keychron/q10/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN A7
diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c
index 8229517fd9c..cf8361bd23e 100644
--- a/keyboards/keychron/q12/matrix.c
+++ b/keyboards/keychron/q12/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN C15
diff --git a/keyboards/keychron/q1v2/matrix.c b/keyboards/keychron/q1v2/matrix.c
index d008a793841..2bdf4bdec7b 100644
--- a/keyboards/keychron/q1v2/matrix.c
+++ b/keyboards/keychron/q1v2/matrix.c
@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN A7
diff --git a/keyboards/keychron/q3/matrix.c b/keyboards/keychron/q3/matrix.c
index 26830780ffe..188156789b3 100644
--- a/keyboards/keychron/q3/matrix.c
+++ b/keyboards/keychron/q3/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN A7
diff --git a/keyboards/keychron/q5/matrix.c b/keyboards/keychron/q5/matrix.c
index 28ef877504a..4809b20677c 100644
--- a/keyboards/keychron/q5/matrix.c
+++ b/keyboards/keychron/q5/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN C15
diff --git a/keyboards/keychron/q6/matrix.c b/keyboards/keychron/q6/matrix.c
index 11f3432e6b1..c59b229cfa6 100644
--- a/keyboards/keychron/q6/matrix.c
+++ b/keyboards/keychron/q6/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN C15
diff --git a/keyboards/keychron/q65/matrix.c b/keyboards/keychron/q65/matrix.c
index 5785f5d5709..206e3012267 100644
--- a/keyboards/keychron/q65/matrix.c
+++ b/keyboards/keychron/q65/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN C15
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
index 00dc1c07793..1ee03394298 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_NO,    KC_DEL,   BL_STEP,
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_NO,    KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
 
     [MAC_FN] = LAYOUT_75_ansi(
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  BL_TOGG,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   BL_STEP,
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_75_ansi(
-        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
index baced4f97c7..cf080071764 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
@@ -28,7 +28,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_SNAP,  KC_DEL,   BL_STEP,
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_SNAP,  KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD,MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_75_ansi(
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  BL_TOGG,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   BL_STEP,
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_75_ansi(
-        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
index 10d2e08aef3..a515205b3a0 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_NO,    KC_DEL,   BL_STEP,
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  KC_NO,    KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_75_ansi(
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  BL_TOGG,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 
     [WIN_BASE] = LAYOUT_75_ansi(
-        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   BL_STEP,
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_PSCR,  KC_DEL,   LM_NEXT,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSPC,            KC_PGUP,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_BSLS,            KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,             KC_ENT,             KC_HOME,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_75_ansi(
-        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  LM_BRID,  LM_BRIU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,   KC_VOLU,  _______,  _______,  LM_TOGG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
-        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
+        LM_TOGG,  LM_NEXT,  LM_BRIU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______,
+        _______,  _______,  LM_BRID,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,            _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,   _______,  _______,  _______,  _______),
 };
diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c
index 2f1b905505f..51bc0596c4a 100644
--- a/keyboards/keychron/s1/s1.c
+++ b/keyboards/keychron/s1/s1.c
@@ -78,7 +78,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
     switch (keycode) {
 #ifdef LED_MATRIX_ENABLE
-        case BL_TOGG:
+        case LM_TOGG:
             if (record->event.pressed) {
                 switch (led_matrix_get_flags()) {
                     case LED_FLAG_ALL: {
diff --git a/keyboards/keychron/v1/matrix.c b/keyboards/keychron/v1/matrix.c
index 82a883834f8..7b9136d4904 100644
--- a/keyboards/keychron/v1/matrix.c
+++ b/keyboards/keychron/v1/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN A7
diff --git a/keyboards/keychron/v10/matrix.c b/keyboards/keychron/v10/matrix.c
index 9269fed8d66..87cda1774ad 100644
--- a/keyboards/keychron/v10/matrix.c
+++ b/keyboards/keychron/v10/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 #ifndef PIN_USED_74HC595
 #    define PIN_USED_74HC595 8
diff --git a/keyboards/keychron/v3/matrix.c b/keyboards/keychron/v3/matrix.c
index 44a1676afa9..c0c39d5b5fd 100644
--- a/keyboards/keychron/v3/matrix.c
+++ b/keyboards/keychron/v3/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN A7
diff --git a/keyboards/keychron/v5/matrix.c b/keyboards/keychron/v5/matrix.c
index ced84428818..fc3a1c4c2c4 100644
--- a/keyboards/keychron/v5/matrix.c
+++ b/keyboards/keychron/v5/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 // Pin connected to DS of 74HC595
 #define DATA_PIN C15
diff --git a/keyboards/keychron/v6/matrix.c b/keyboards/keychron/v6/matrix.c
index 9269fed8d66..87cda1774ad 100644
--- a/keyboards/keychron/v6/matrix.c
+++ b/keyboards/keychron/v6/matrix.c
@@ -15,7 +15,8 @@
  */
 
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
 
 #ifndef PIN_USED_74HC595
 #    define PIN_USED_74HC595 8
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
deleted file mode 100644
index 3e47764d5eb..00000000000
--- a/keyboards/keyprez/bison/info.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
-    "keyboard_name": "bison",
-    "manufacturer": "csandven",
-    "url": "",
-    "maintainer": "Christian Sandven",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"],
-        "rows": ["D2", "F7", "B1", "B3", "D7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B6", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B5", "pin_b": "B6"}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 7], "x": 0, "y": 0},
-                {"matrix": [0, 6], "x": 1, "y": 0},
-                {"matrix": [0, 5], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-                {"matrix": [0, 1], "x": 6, "y": 0},
-                {"matrix": [0, 0], "x": 7, "y": 0},
-
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
-                {"matrix": [5, 5], "x": 15, "y": 0},
-                {"matrix": [5, 6], "x": 16, "y": 0},
-                {"matrix": [5, 7], "x": 17, "y": 0},
-
-                {"matrix": [1, 7], "x": 0, "y": 1},
-                {"matrix": [1, 6], "x": 1, "y": 1},
-                {"matrix": [1, 5], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 2], "x": 5, "y": 1},
-                {"matrix": [1, 1], "x": 6, "y": 1},
-                {"matrix": [1, 0], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-                {"matrix": [6, 6], "x": 16, "y": 1},
-                {"matrix": [6, 7], "x": 17, "y": 1},
-
-                {"matrix": [2, 7], "x": 0, "y": 2},
-                {"matrix": [2, 6], "x": 1, "y": 2},
-                {"matrix": [2, 5], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 1], "x": 6, "y": 2},
-                {"matrix": [2, 0], "x": 7, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-                {"matrix": [7, 6], "x": 16, "y": 2},
-                {"matrix": [7, 7], "x": 17, "y": 2},
-
-                {"matrix": [3, 7], "x": 0, "y": 3},
-                {"matrix": [3, 6], "x": 1, "y": 3},
-                {"matrix": [3, 5], "x": 2, "y": 3},
-                {"matrix": [3, 4], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 2], "x": 5, "y": 3},
-                {"matrix": [3, 1], "x": 6, "y": 3},
-                {"matrix": [3, 0], "x": 7, "y": 3},
-                {"matrix": [4, 4], "x": 8, "y": 3},
-
-                {"matrix": [9, 4], "x": 9, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-                {"matrix": [8, 6], "x": 16, "y": 3},
-                {"matrix": [8, 7], "x": 17, "y": 3},
-
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 2], "x": 4.75, "y": 4},
-                {"matrix": [4, 1], "x": 5.75, "y": 4},
-                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 11.25, "y": 4},
-                {"matrix": [9, 2], "x": 12.25, "y": 4},
-                {"matrix": [9, 3], "x": 13.25, "y": 4}
-            ]
-        },
-        "LAYOUT_6_8": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-                {"matrix": [0, 4], "x": 1, "y": 0},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0},
-                {"matrix": [0, 0], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [5, 7], "x": 15, "y": 0},
-
-                {"matrix": [1, 5], "x": 0, "y": 1},
-                {"matrix": [1, 4], "x": 1, "y": 1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1},
-                {"matrix": [1, 0], "x": 5, "y": 1},
-
-                {"matrix": [6, 0], "x": 8, "y": 1},
-                {"matrix": [6, 1], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-                {"matrix": [6, 6], "x": 14, "y": 1},
-                {"matrix": [6, 7], "x": 15, "y": 1},
-
-                {"matrix": [2, 5], "x": 0, "y": 2},
-                {"matrix": [2, 4], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 0], "x": 5, "y": 2},
-
-                {"matrix": [7, 0], "x": 8, "y": 2},
-                {"matrix": [7, 1], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 5], "x": 13, "y": 2},
-                {"matrix": [7, 6], "x": 14, "y": 2},
-                {"matrix": [7, 7], "x": 15, "y": 2},
-
-                {"matrix": [3, 5], "x": 0, "y": 3},
-                {"matrix": [3, 4], "x": 1, "y": 3},
-                {"matrix": [3, 3], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 1], "x": 4, "y": 3},
-                {"matrix": [3, 0], "x": 5, "y": 3},
-                {"matrix": [4, 4], "x": 6, "y": 3},
-
-                {"matrix": [9, 4], "x": 7, "y": 3},
-                {"matrix": [8, 0], "x": 8, "y": 3},
-                {"matrix": [8, 1], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 5], "x": 13, "y": 3},
-                {"matrix": [8, 6], "x": 14, "y": 3},
-                {"matrix": [8, 7], "x": 15, "y": 3},
-
-                {"matrix": [4, 3], "x": 1.75, "y": 4},
-                {"matrix": [4, 2], "x": 2.75, "y": 4},
-                {"matrix": [4, 1], "x": 3.75, "y": 4},
-                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 9.25, "y": 4},
-                {"matrix": [9, 2], "x": 10.25, "y": 4},
-                {"matrix": [9, 3], "x": 11.25, "y": 4}
-            ]
-        },
-        "LAYOUT_8_6": {
-            "layout": [
-                {"matrix": [0, 7], "x": 0, "y": 0},
-                {"matrix": [0, 6], "x": 1, "y": 0},
-                {"matrix": [0, 5], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 2], "x": 5, "y": 0},
-                {"matrix": [0, 1], "x": 6, "y": 0},
-                {"matrix": [0, 0], "x": 7, "y": 0},
-
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
-                {"matrix": [5, 5], "x": 15, "y": 0},
-
-                {"matrix": [1, 7], "x": 0, "y": 1},
-                {"matrix": [1, 6], "x": 1, "y": 1},
-                {"matrix": [1, 5], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 2], "x": 5, "y": 1},
-                {"matrix": [1, 1], "x": 6, "y": 1},
-                {"matrix": [1, 0], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-                {"matrix": [6, 5], "x": 15, "y": 1},
-
-                {"matrix": [2, 7], "x": 0, "y": 2},
-                {"matrix": [2, 6], "x": 1, "y": 2},
-                {"matrix": [2, 5], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 2], "x": 5, "y": 2},
-                {"matrix": [2, 1], "x": 6, "y": 2},
-                {"matrix": [2, 0], "x": 7, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-                {"matrix": [7, 5], "x": 15, "y": 2},
-
-                {"matrix": [3, 7], "x": 0, "y": 3},
-                {"matrix": [3, 6], "x": 1, "y": 3},
-                {"matrix": [3, 5], "x": 2, "y": 3},
-                {"matrix": [3, 4], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 2], "x": 5, "y": 3},
-                {"matrix": [3, 1], "x": 6, "y": 3},
-                {"matrix": [3, 0], "x": 7, "y": 3},
-                {"matrix": [4, 4], "x": 8, "y": 3},
-
-                {"matrix": [9, 4], "x": 9, "y": 3},
-                {"matrix": [8, 0], "x": 10, "y": 3},
-                {"matrix": [8, 1], "x": 11, "y": 3},
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 4], "x": 14, "y": 3},
-                {"matrix": [8, 5], "x": 15, "y": 3},
-
-                {"matrix": [4, 3], "x": 3.75, "y": 4},
-                {"matrix": [4, 2], "x": 4.75, "y": 4},
-                {"matrix": [4, 1], "x": 5.75, "y": 4},
-                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 11.25, "y": 4},
-                {"matrix": [9, 2], "x": 12.25, "y": 4},
-                {"matrix": [9, 3], "x": 13.25, "y": 4}
-            ]
-        },
-        "LAYOUT_6_6": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0},
-                {"matrix": [0, 4], "x": 1, "y": 0},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 1], "x": 4, "y": 0},
-                {"matrix": [0, 0], "x": 5, "y": 0},
-
-                {"matrix": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 5], "x": 13, "y": 0},
-
-                {"matrix": [1, 5], "x": 0, "y": 1},
-                {"matrix": [1, 4], "x": 1, "y": 1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 1], "x": 4, "y": 1},
-                {"matrix": [1, 0], "x": 5, "y": 1},
-
-                {"matrix": [6, 0], "x": 8, "y": 1},
-                {"matrix": [6, 1], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 5], "x": 13, "y": 1},
-
-                {"matrix": [2, 5], "x": 0, "y": 2},
-                {"matrix": [2, 4], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 1], "x": 4, "y": 2},
-                {"matrix": [2, 0], "x": 5, "y": 2},
-
-                {"matrix": [7, 0], "x": 8, "y": 2},
-                {"matrix": [7, 1], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 5], "x": 13, "y": 2},
-
-                {"matrix": [3, 5], "x": 0, "y": 3},
-                {"matrix": [3, 4], "x": 1, "y": 3},
-                {"matrix": [3, 3], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 1], "x": 4, "y": 3},
-                {"matrix": [3, 0], "x": 5, "y": 3},
-                {"matrix": [4, 4], "x": 6, "y": 3},
-
-                {"matrix": [9, 4], "x": 7, "y": 3},
-                {"matrix": [8, 0], "x": 8, "y": 3},
-                {"matrix": [8, 1], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 5], "x": 13, "y": 3},
-
-                {"matrix": [4, 3], "x": 1.75, "y": 4},
-                {"matrix": [4, 2], "x": 2.75, "y": 4},
-                {"matrix": [4, 1], "x": 3.75, "y": 4},
-                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 9.25, "y": 4},
-                {"matrix": [9, 2], "x": 10.25, "y": 4},
-                {"matrix": [9, 3], "x": 11.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyprez/bison/keyboard.json b/keyboards/keyprez/bison/keyboard.json
new file mode 100644
index 00000000000..462b9d4274c
--- /dev/null
+++ b/keyboards/keyprez/bison/keyboard.json
@@ -0,0 +1,361 @@
+{
+    "keyboard_name": "bison",
+    "manufacturer": "csandven",
+    "url": "",
+    "maintainer": "Christian Sandven",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"],
+        "rows": ["D2", "F7", "B1", "B3", "D7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B6", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B5", "pin_b": "B6"}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 7], "x": 0, "y": 0},
+                {"matrix": [0, 6], "x": 1, "y": 0},
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 6, "y": 0},
+                {"matrix": [0, 0], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 4], "x": 14, "y": 0},
+                {"matrix": [5, 5], "x": 15, "y": 0},
+                {"matrix": [5, 6], "x": 16, "y": 0},
+                {"matrix": [5, 7], "x": 17, "y": 0},
+
+                {"matrix": [1, 7], "x": 0, "y": 1},
+                {"matrix": [1, 6], "x": 1, "y": 1},
+                {"matrix": [1, 5], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [1, 1], "x": 6, "y": 1},
+                {"matrix": [1, 0], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1},
+
+                {"matrix": [2, 7], "x": 0, "y": 2},
+                {"matrix": [2, 6], "x": 1, "y": 2},
+                {"matrix": [2, 5], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 0], "x": 7, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+                {"matrix": [7, 6], "x": 16, "y": 2},
+                {"matrix": [7, 7], "x": 17, "y": 2},
+
+                {"matrix": [3, 7], "x": 0, "y": 3},
+                {"matrix": [3, 6], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+                {"matrix": [3, 0], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+
+                {"matrix": [9, 4], "x": 9, "y": 3},
+                {"matrix": [8, 0], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+                {"matrix": [8, 6], "x": 16, "y": 3},
+                {"matrix": [8, 7], "x": 17, "y": 3},
+
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 1], "x": 5.75, "y": 4},
+                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 11.25, "y": 4},
+                {"matrix": [9, 2], "x": 12.25, "y": 4},
+                {"matrix": [9, 3], "x": 13.25, "y": 4}
+            ]
+        },
+        "LAYOUT_6_8": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 5], "x": 0, "y": 1},
+                {"matrix": [1, 4], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+                {"matrix": [6, 6], "x": 14, "y": 1},
+                {"matrix": [6, 7], "x": 15, "y": 1},
+
+                {"matrix": [2, 5], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+                {"matrix": [7, 6], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2},
+
+                {"matrix": [3, 5], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [4, 4], "x": 6, "y": 3},
+
+                {"matrix": [9, 4], "x": 7, "y": 3},
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+
+                {"matrix": [4, 3], "x": 1.75, "y": 4},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 9.25, "y": 4},
+                {"matrix": [9, 2], "x": 10.25, "y": 4},
+                {"matrix": [9, 3], "x": 11.25, "y": 4}
+            ]
+        },
+        "LAYOUT_8_6": {
+            "layout": [
+                {"matrix": [0, 7], "x": 0, "y": 0},
+                {"matrix": [0, 6], "x": 1, "y": 0},
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [0, 1], "x": 6, "y": 0},
+                {"matrix": [0, 0], "x": 7, "y": 0},
+
+                {"matrix": [5, 0], "x": 10, "y": 0},
+                {"matrix": [5, 1], "x": 11, "y": 0},
+                {"matrix": [5, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 4], "x": 14, "y": 0},
+                {"matrix": [5, 5], "x": 15, "y": 0},
+
+                {"matrix": [1, 7], "x": 0, "y": 1},
+                {"matrix": [1, 6], "x": 1, "y": 1},
+                {"matrix": [1, 5], "x": 2, "y": 1},
+                {"matrix": [1, 4], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 2], "x": 5, "y": 1},
+                {"matrix": [1, 1], "x": 6, "y": 1},
+                {"matrix": [1, 0], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+
+                {"matrix": [2, 7], "x": 0, "y": 2},
+                {"matrix": [2, 6], "x": 1, "y": 2},
+                {"matrix": [2, 5], "x": 2, "y": 2},
+                {"matrix": [2, 4], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 1], "x": 6, "y": 2},
+                {"matrix": [2, 0], "x": 7, "y": 2},
+
+                {"matrix": [7, 0], "x": 10, "y": 2},
+                {"matrix": [7, 1], "x": 11, "y": 2},
+                {"matrix": [7, 2], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 4], "x": 14, "y": 2},
+                {"matrix": [7, 5], "x": 15, "y": 2},
+
+                {"matrix": [3, 7], "x": 0, "y": 3},
+                {"matrix": [3, 6], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3},
+                {"matrix": [3, 4], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 2], "x": 5, "y": 3},
+                {"matrix": [3, 1], "x": 6, "y": 3},
+                {"matrix": [3, 0], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+
+                {"matrix": [9, 4], "x": 9, "y": 3},
+                {"matrix": [8, 0], "x": 10, "y": 3},
+                {"matrix": [8, 1], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 4], "x": 14, "y": 3},
+                {"matrix": [8, 5], "x": 15, "y": 3},
+
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 2], "x": 4.75, "y": 4},
+                {"matrix": [4, 1], "x": 5.75, "y": 4},
+                {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 11.25, "y": 4},
+                {"matrix": [9, 2], "x": 12.25, "y": 4},
+                {"matrix": [9, 3], "x": 13.25, "y": 4}
+            ]
+        },
+        "LAYOUT_6_6": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 1], "x": 4, "y": 0},
+                {"matrix": [0, 0], "x": 5, "y": 0},
+
+                {"matrix": [5, 0], "x": 8, "y": 0},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+
+                {"matrix": [1, 5], "x": 0, "y": 1},
+                {"matrix": [1, 4], "x": 1, "y": 1},
+                {"matrix": [1, 3], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 1], "x": 4, "y": 1},
+                {"matrix": [1, 0], "x": 5, "y": 1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1},
+                {"matrix": [6, 1], "x": 9, "y": 1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 5], "x": 13, "y": 1},
+
+                {"matrix": [2, 5], "x": 0, "y": 2},
+                {"matrix": [2, 4], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 1], "x": 4, "y": 2},
+                {"matrix": [2, 0], "x": 5, "y": 2},
+
+                {"matrix": [7, 0], "x": 8, "y": 2},
+                {"matrix": [7, 1], "x": 9, "y": 2},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 5], "x": 13, "y": 2},
+
+                {"matrix": [3, 5], "x": 0, "y": 3},
+                {"matrix": [3, 4], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 1], "x": 4, "y": 3},
+                {"matrix": [3, 0], "x": 5, "y": 3},
+                {"matrix": [4, 4], "x": 6, "y": 3},
+
+                {"matrix": [9, 4], "x": 7, "y": 3},
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+
+                {"matrix": [4, 3], "x": 1.75, "y": 4},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 1], "x": 3.75, "y": 4},
+                {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 9.25, "y": 4},
+                {"matrix": [9, 2], "x": 10.25, "y": 4},
+                {"matrix": [9, 3], "x": 11.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk
deleted file mode 100644
index 21a7746f6c6..00000000000
--- a/keyboards/keyprez/bison/rules.mk
+++ /dev/null
@@ -1,15 +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
-
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
deleted file mode 100644
index 58d2a98d300..00000000000
--- a/keyboards/keyprez/unicorn/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "keyboard_name": "Unicorn",
-    "manufacturer": "Keyprez",
-    "url": "",
-    "maintainer": "Keyprez",
-    "usb": {
-        "vid": "0x6B7A",
-        "pid": "0x7563",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
-        "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D2", "pin_b": "D4"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"],
-                "rows": ["F4", "B2", "F6", "F7", "B1", "B3"]
-            }
-        }
-    },
-    "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": [6, 0], "x": 8, "y": 0},
-                {"matrix": [6, 1], "x": 9, "y": 0},
-                {"matrix": [6, 2], "x": 10, "y": 0},
-                {"matrix": [6, 3], "x": 11, "y": 0},
-                {"matrix": [6, 4], "x": 12, "y": 0},
-                {"matrix": [6, 5], "x": 13, "y": 0},
-                {"matrix": [6, 6], "x": 14, "y": 0, "w": 2},
-                {"matrix": [6, 7], "x": 16, "y": 0},
-                {"matrix": [11, 2], "x": 17, "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": [7, 0], "x": 7.5, "y": 1},
-                {"matrix": [7, 1], "x": 8.5, "y": 1},
-                {"matrix": [7, 2], "x": 9.5, "y": 1},
-                {"matrix": [7, 3], "x": 10.5, "y": 1},
-                {"matrix": [7, 4], "x": 11.5, "y": 1},
-                {"matrix": [7, 5], "x": 12.5, "y": 1},
-                {"matrix": [7, 6], "x": 13.5, "y": 1},
-                {"matrix": [11, 4], "x": 16, "y": 1},
-                {"matrix": [11, 3], "x": 17, "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": [8, 0], "x": 7.75, "y": 2},
-                {"matrix": [8, 1], "x": 8.75, "y": 2},
-                {"matrix": [8, 2], "x": 9.75, "y": 2},
-                {"matrix": [8, 3], "x": 10.75, "y": 2},
-                {"matrix": [8, 4], "x": 11.75, "y": 2},
-                {"matrix": [8, 5], "x": 12.75, "y": 2},
-                {"matrix": [8, 6], "x": 13.75, "y": 2},
-                {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
-                {"matrix": [11, 6], "x": 16, "y": 2},
-                {"matrix": [11, 5], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-
-                {"matrix": [9, 0], "x": 8.25, "y": 3},
-                {"matrix": [9, 1], "x": 9.25, "y": 3},
-                {"matrix": [9, 2], "x": 10.25, "y": 3},
-                {"matrix": [9, 3], "x": 11.25, "y": 3},
-                {"matrix": [9, 4], "x": 12.25, "y": 3},
-                {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75},
-                {"matrix": [9, 6], "x": 15, "y": 3},
-                {"matrix": [9, 7], "x": 16, "y": 3},
-                {"matrix": [11, 7], "x": 17, "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, 5], "x": 6, "y": 4, "w": 1.25},
-
-                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75},
-                {"matrix": [10, 1], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 12, "y": 4},
-                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 4], "x": 14, "y": 4},
-                {"matrix": [10, 5], "x": 15, "y": 4},
-                {"matrix": [10, 6], "x": 16, "y": 4},
-                {"matrix": [10, 7], "x": 17, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keyprez/unicorn/keyboard.json b/keyboards/keyprez/unicorn/keyboard.json
new file mode 100644
index 00000000000..56061290ea7
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "Unicorn",
+    "manufacturer": "Keyprez",
+    "url": "",
+    "maintainer": "Keyprez",
+    "usb": {
+        "vid": "0x6B7A",
+        "pid": "0x7563",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
+        "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D2", "pin_b": "D4"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"],
+                "rows": ["F4", "B2", "F6", "F7", "B1", "B3"]
+            }
+        }
+    },
+    "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": [6, 0], "x": 8, "y": 0},
+                {"matrix": [6, 1], "x": 9, "y": 0},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0},
+                {"matrix": [6, 5], "x": 13, "y": 0},
+                {"matrix": [6, 6], "x": 14, "y": 0, "w": 2},
+                {"matrix": [6, 7], "x": 16, "y": 0},
+                {"matrix": [11, 2], "x": 17, "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": [7, 0], "x": 7.5, "y": 1},
+                {"matrix": [7, 1], "x": 8.5, "y": 1},
+                {"matrix": [7, 2], "x": 9.5, "y": 1},
+                {"matrix": [7, 3], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 5], "x": 12.5, "y": 1},
+                {"matrix": [7, 6], "x": 13.5, "y": 1},
+                {"matrix": [11, 4], "x": 16, "y": 1},
+                {"matrix": [11, 3], "x": 17, "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": [8, 0], "x": 7.75, "y": 2},
+                {"matrix": [8, 1], "x": 8.75, "y": 2},
+                {"matrix": [8, 2], "x": 9.75, "y": 2},
+                {"matrix": [8, 3], "x": 10.75, "y": 2},
+                {"matrix": [8, 4], "x": 11.75, "y": 2},
+                {"matrix": [8, 5], "x": 12.75, "y": 2},
+                {"matrix": [8, 6], "x": 13.75, "y": 2},
+                {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [11, 6], "x": 16, "y": 2},
+                {"matrix": [11, 5], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 3},
+                {"matrix": [9, 1], "x": 9.25, "y": 3},
+                {"matrix": [9, 2], "x": 10.25, "y": 3},
+                {"matrix": [9, 3], "x": 11.25, "y": 3},
+                {"matrix": [9, 4], "x": 12.25, "y": 3},
+                {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [9, 6], "x": 15, "y": 3},
+                {"matrix": [9, 7], "x": 16, "y": 3},
+                {"matrix": [11, 7], "x": 17, "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, 5], "x": 6, "y": 4, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [10, 1], "x": 11, "y": 4},
+                {"matrix": [10, 2], "x": 12, "y": 4},
+                {"matrix": [10, 3], "x": 13, "y": 4},
+                {"matrix": [10, 4], "x": 14, "y": 4},
+                {"matrix": [10, 5], "x": 15, "y": 4},
+                {"matrix": [10, 6], "x": 16, "y": 4},
+                {"matrix": [10, 7], "x": 17, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk
deleted file mode 100644
index 9458603d100..00000000000
--- a/keyboards/keyprez/unicorn/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
deleted file mode 100644
index b2d2a01f8b0..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-    "keyboard_name": "Game Roy ADVANCE",
-    "manufacturer": "Keystone Caps",
-    "url": "https://keystonecaps.store/?product=game-roy-advance-game-pad-group-buy-preorder",
-    "maintainer": "@RoyMeetsWorld",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"],
-        "rows": ["F5", "F6", "F7", "B1", "B3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B5", "pin_b": "B4"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 0,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B3", "pin_b": "B2"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["C6", "D4", "D0", "D1", "B1", "F7", "F4", "F5", "F6"],
-                "rows": ["D7", "E6", "B4", "B5", "B6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 13.25, "y": 0},
-                {"matrix": [5, 1], "x": 14.25, "y": 0},
-                {"matrix": [5, 2], "x": 15.25, "y": 0},
-                {"matrix": [5, 3], "x": 16.25, "y": 0},
-                {"matrix": [5, 4], "x": 17.25, "y": 0},
-                {"matrix": [5, 5], "x": 18.25, "y": 0},
-                {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 10.5, "y": 1},
-                {"matrix": [6, 1], "x": 11.5, "y": 1},
-                {"matrix": [6, 2], "x": 13.25, "y": 1},
-                {"matrix": [6, 3], "x": 14.25, "y": 1},
-                {"matrix": [6, 4], "x": 15.25, "y": 1},
-                {"matrix": [6, 5], "x": 16.25, "y": 1},
-                {"matrix": [6, 6], "x": 17.25, "y": 1},
-                {"matrix": [6, 7], "x": 18.25, "y": 1},
-                {"matrix": [6, 8], "x": 19.25, "y": 1},
-                {"matrix": [7, 8], "x": 20.25, "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, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 13.5, "y": 2},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 4], "x": 15.5, "y": 2},
-                {"matrix": [7, 5], "x": 16.5, "y": 2},
-                {"matrix": [7, 6], "x": 17.5, "y": 2},
-                {"matrix": [7, 7], "x": 18.5, "y": 2},
-                {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-                {"matrix": [8, 4], "x": 15, "y": 3},
-                {"matrix": [8, 5], "x": 16, "y": 3},
-                {"matrix": [8, 6], "x": 17, "y": 3},
-                {"matrix": [8, 7], "x": 18, "y": 3},
-                {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
-                {"matrix": [4, 8], "x": 7.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 11.75, "y": 4},
-                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
-                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
-
-                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.5, "y": 0},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 13.25, "y": 0},
-                {"matrix": [5, 1], "x": 14.25, "y": 0},
-                {"matrix": [5, 2], "x": 15.25, "y": 0},
-                {"matrix": [5, 3], "x": 16.25, "y": 0},
-                {"matrix": [5, 4], "x": 17.25, "y": 0},
-                {"matrix": [5, 5], "x": 18.25, "y": 0},
-                {"matrix": [5, 6], "x": 19.25, "y": 0},
-                {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
-                {"matrix": [5, 8], "x": 20.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.75, "y": 1},
-                {"matrix": [1, 8], "x": 8.75, "y": 1},
-
-                {"matrix": [6, 0], "x": 10.5, "y": 1},
-                {"matrix": [6, 1], "x": 11.5, "y": 1},
-                {"matrix": [6, 2], "x": 13.25, "y": 1},
-                {"matrix": [6, 3], "x": 14.25, "y": 1},
-                {"matrix": [6, 4], "x": 15.25, "y": 1},
-                {"matrix": [6, 5], "x": 16.25, "y": 1},
-                {"matrix": [6, 6], "x": 17.25, "y": 1},
-                {"matrix": [6, 7], "x": 18.25, "y": 1},
-                {"matrix": [6, 8], "x": 19.25, "y": 1},
-                {"matrix": [7, 8], "x": 20.25, "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, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-
-                {"matrix": [7, 0], "x": 10.5, "y": 2},
-                {"matrix": [7, 1], "x": 11.5, "y": 2},
-                {"matrix": [7, 2], "x": 13.5, "y": 2},
-                {"matrix": [7, 3], "x": 14.5, "y": 2},
-                {"matrix": [7, 4], "x": 15.5, "y": 2},
-                {"matrix": [7, 5], "x": 16.5, "y": 2},
-                {"matrix": [7, 6], "x": 17.5, "y": 2},
-                {"matrix": [7, 7], "x": 18.5, "y": 2},
-                {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 4], "x": 1.25, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 10.5, "y": 3},
-                {"matrix": [8, 1], "x": 11.5, "y": 3},
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-                {"matrix": [8, 4], "x": 15, "y": 3},
-                {"matrix": [8, 5], "x": 16, "y": 3},
-                {"matrix": [8, 6], "x": 17, "y": 3},
-                {"matrix": [8, 7], "x": 18, "y": 3},
-                {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
-                {"matrix": [9, 8], "x": 20.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
-                {"matrix": [4, 8], "x": 7.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 11.75, "y": 4},
-                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
-                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
-
-                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keystonecaps/gameroyadvance/keyboard.json b/keyboards/keystonecaps/gameroyadvance/keyboard.json
new file mode 100644
index 00000000000..89b30fe4d80
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keyboard.json
@@ -0,0 +1,267 @@
+{
+    "keyboard_name": "Game Roy ADVANCE",
+    "manufacturer": "Keystone Caps",
+    "url": "https://keystonecaps.store/?product=game-roy-advance-game-pad-group-buy-preorder",
+    "maintainer": "@RoyMeetsWorld",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"],
+        "rows": ["F5", "F6", "F7", "B1", "B3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B5", "pin_b": "B4"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 0,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B3", "pin_b": "B2"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["C6", "D4", "D0", "D1", "B1", "F7", "F4", "F5", "F6"],
+                "rows": ["D7", "E6", "B4", "B5", "B6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 0},
+                {"matrix": [5, 1], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 4], "x": 17.25, "y": 0},
+                {"matrix": [5, 5], "x": 18.25, "y": 0},
+                {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 10.5, "y": 1},
+                {"matrix": [6, 1], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 4], "x": 15.25, "y": 1},
+                {"matrix": [6, 5], "x": 16.25, "y": 1},
+                {"matrix": [6, 6], "x": 17.25, "y": 1},
+                {"matrix": [6, 7], "x": 18.25, "y": 1},
+                {"matrix": [6, 8], "x": 19.25, "y": 1},
+                {"matrix": [7, 8], "x": 20.25, "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, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.5, "y": 2},
+                {"matrix": [7, 1], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 4], "x": 15.5, "y": 2},
+                {"matrix": [7, 5], "x": 16.5, "y": 2},
+                {"matrix": [7, 6], "x": 17.5, "y": 2},
+                {"matrix": [7, 7], "x": 18.5, "y": 2},
+                {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 4], "x": 15, "y": 3},
+                {"matrix": [8, 5], "x": 16, "y": 3},
+                {"matrix": [8, 6], "x": 17, "y": 3},
+                {"matrix": [8, 7], "x": 18, "y": 3},
+                {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+                {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 13.25, "y": 0},
+                {"matrix": [5, 1], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 4], "x": 17.25, "y": 0},
+                {"matrix": [5, 5], "x": 18.25, "y": 0},
+                {"matrix": [5, 6], "x": 19.25, "y": 0},
+                {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
+                {"matrix": [5, 8], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 10.5, "y": 1},
+                {"matrix": [6, 1], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 4], "x": 15.25, "y": 1},
+                {"matrix": [6, 5], "x": 16.25, "y": 1},
+                {"matrix": [6, 6], "x": 17.25, "y": 1},
+                {"matrix": [6, 7], "x": 18.25, "y": 1},
+                {"matrix": [6, 8], "x": 19.25, "y": 1},
+                {"matrix": [7, 8], "x": 20.25, "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, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.5, "y": 2},
+                {"matrix": [7, 1], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2},
+                {"matrix": [7, 3], "x": 14.5, "y": 2},
+                {"matrix": [7, 4], "x": 15.5, "y": 2},
+                {"matrix": [7, 5], "x": 16.5, "y": 2},
+                {"matrix": [7, 6], "x": 17.5, "y": 2},
+                {"matrix": [7, 7], "x": 18.5, "y": 2},
+                {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 4], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 10.5, "y": 3},
+                {"matrix": [8, 1], "x": 11.5, "y": 3},
+                {"matrix": [8, 2], "x": 13, "y": 3},
+                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 4], "x": 15, "y": 3},
+                {"matrix": [8, 5], "x": 16, "y": 3},
+                {"matrix": [8, 6], "x": 17, "y": 3},
+                {"matrix": [8, 7], "x": 18, "y": 3},
+                {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
+                {"matrix": [9, 8], "x": 20.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+                {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+                {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+                {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk
deleted file mode 100644
index 2a8d8c7bce6..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/rules.mk
+++ /dev/null
@@ -1,15 +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
-
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/kinesis/nguyenvietyen/matrix.c b/keyboards/kinesis/nguyenvietyen/matrix.c
index d6ea67da681..4e4ca6f55cc 100644
--- a/keyboards/kinesis/nguyenvietyen/matrix.c
+++ b/keyboards/kinesis/nguyenvietyen/matrix.c
@@ -3,8 +3,6 @@
 
 #include "matrix.h"
 
-#include "quantum.h"
-
 static matrix_row_t read_row(uint8_t row) {
     matrix_io_delay();  // without this wait read unstable value.
 
diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
index b7f98c68caf..77c3603f8a5 100644
--- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
+++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
         QK_BOOT,    KC_UP,   _______,
-        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+        KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
     ),
     [_FN2] = LAYOUT(
         _______,    _______,   _______,
diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
index 0641efab59b..4aa89cab951 100644
--- a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
+++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT(
         QK_BOOT,    KC_UP,   _______,
-        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+        KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
     )
 };
diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
index bfe8208a8b4..0c66b20c915 100644
--- a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
+++ b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN1] = LAYOUT(
         QK_BOOT,    KC_UP,   _______,
-        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+        KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
     ),
     [_FN2] = LAYOUT(
         _______,    _______,   _______,
diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
index 0641efab59b..4aa89cab951 100644
--- a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
+++ b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [_FN] = LAYOUT(
         QK_BOOT,    KC_UP,   _______,
-        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+        KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
     )
 };
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index 805593ed5be..cbe283378da 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -10,7 +10,6 @@ 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
-NO_USB_STARTUP_CHECK = no
 LTO_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/kumaokobo/kudox/info.json b/keyboards/kumaokobo/kudox/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
index 261c8e2a2b7..ff1dfc760e7 100644
--- a/keyboards/kumaokobo/kudox/rules.mk
+++ b/keyboards/kumaokobo/kudox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = kumaokobo/kudox/rev3
diff --git a/keyboards/kumaokobo/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
index 673fda9acfc..d12984f16e3 100644
--- a/keyboards/kumaokobo/kudox_full/rev1/info.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "rgblight": {
diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
index 06453b2337a..2924b7cee57 100644
--- a/keyboards/kumaokobo/kudox_full/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
@@ -13,6 +13,4 @@ AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
 LTO_ENABLE = yes
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
diff --git a/keyboards/kumaokobo/pico/info.json b/keyboards/kumaokobo/pico/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/kumaokobo/pico/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
index 11fe77d618d..36372376ea1 100644
--- a/keyboards/kumaokobo/pico/rules.mk
+++ b/keyboards/kumaokobo/pico/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = kumaokobo/pico/65keys
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
deleted file mode 100644
index a211846f628..00000000000
--- a/keyboards/latincompass/latin17rgb/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "keyboard_name": "Latin17RGB",
-  "manufacturer": "18438880",
-  "url": "",
-  "maintainer": "18438880",
-  "usb": {
-    "vid": "0x7C88",
-    "pid": "0x7C97",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "hue_steps": 5,
-    "saturation_steps": 5,
-    "brightness_steps": 5,
-    "led_count": 8,
-    "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": "B7"
-  },
-  "rgb_matrix": {
-    "animations": {
-      "alphas_mods": true,
-      "gradient_left_right": true,
-      "breathing": true,
-      "band_val": true,
-      "band_pinwheel_val": 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,
-      "solid_reactive_simple": true,
-      "solid_reactive": true
-    },
-    "driver": "is31fl3731",
-    "sleep": true
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5", "F4"],
-    "rows": ["C7", "C6", "B6", "B5", "B4"]
-  },
-  "diode_direction": "ROW2COL",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "debounce": 3,
-  "community_layouts": ["numpad_5x4"],
-  "layout_aliases": {
-    "LAYOUT_pad": "LAYOUT_numpad_5x4"
-  },
-  "layouts": {
-    "LAYOUT_numpad_5x4": {
-      "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": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2},
-        {"matrix": [2, 2], "x": 2, "y": 2},
-        {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3},
-        {"matrix": [3, 2], "x": 2, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-        {"matrix": [4, 1], "x": 2, "y": 4},
-        {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
-      ]
-    }
-  }
-}
diff --git a/keyboards/latincompass/latin17rgb/keyboard.json b/keyboards/latincompass/latin17rgb/keyboard.json
new file mode 100644
index 00000000000..161672aea4f
--- /dev/null
+++ b/keyboards/latincompass/latin17rgb/keyboard.json
@@ -0,0 +1,115 @@
+{
+  "keyboard_name": "Latin17RGB",
+  "manufacturer": "18438880",
+  "url": "",
+  "maintainer": "18438880",
+  "usb": {
+    "vid": "0x7C88",
+    "pid": "0x7C97",
+    "device_version": "0.0.1"
+  },
+  "rgblight": {
+    "hue_steps": 5,
+    "saturation_steps": 5,
+    "brightness_steps": 5,
+    "led_count": 8,
+    "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": "B7"
+  },
+  "rgb_matrix": {
+    "animations": {
+      "alphas_mods": true,
+      "gradient_left_right": true,
+      "breathing": true,
+      "band_val": true,
+      "band_pinwheel_val": 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,
+      "solid_reactive_simple": true,
+      "solid_reactive": true
+    },
+    "driver": "is31fl3731",
+    "sleep": true
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "rgb_matrix": true
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "F4"],
+    "rows": ["C7", "C6", "B6", "B5", "B4"]
+  },
+  "diode_direction": "ROW2COL",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 3,
+  "community_layouts": ["numpad_5x4"],
+  "layout_aliases": {
+    "LAYOUT_pad": "LAYOUT_numpad_5x4"
+  },
+  "layouts": {
+    "LAYOUT_numpad_5x4": {
+      "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": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+        {"matrix": [4, 1], "x": 2, "y": 4},
+        {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
+      ]
+    }
+  }
+}
diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
deleted file mode 100644
index 53e01e55d24..00000000000
--- a/keyboards/latincompass/latin17rgb/rules.mk
+++ /dev/null
@@ -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
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
index f3108efe8b2..c05a204a403 100644
--- a/keyboards/latincompass/latin6rgb/rules.mk
+++ b/keyboards/latincompass/latin6rgb/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 
 AUDIO_ENABLE = no              # Audio output
 
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_ENABLE = yes
 
 RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json
index a92a948abd2..4640bd9e84f 100644
--- a/keyboards/lets_split/info.json
+++ b/keyboards/lets_split/info.json
@@ -3,5 +3,8 @@
   "maintainer": "qmk",
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "split": {
+    "enabled": true
+  },
   "community_layouts": ["ortho_4x12"]
 }
diff --git a/keyboards/lets_split/keymaps/poker/config.h b/keyboards/lets_split/keymaps/poker/config.h
deleted file mode 100644
index 470fc078542..00000000000
--- a/keyboards/lets_split/keymaps/poker/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c
index 37e9dd9aedb..7b17b71f971 100644
--- a/keyboards/lets_split/keymaps/poker/keymap.c
+++ b/keyboards/lets_split/keymaps/poker/keymap.c
@@ -13,7 +13,7 @@ extern keymap_config_t keymap_config;
 #define _LOWER 3
 #define _RAISE 4
 #define _FN 5
-#define _ADJUST 16
+#define _ADJUST 6
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
@@ -161,11 +161,6 @@ float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -173,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -182,7 +177,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -191,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index cb7097b091a..11f365e8e9c 100644
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = lets_split/rev2
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index d81ed91814d..c149ea04b4b 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index 1f3ef6fc8e1..d07d7de4e6d 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index 041c3cdfd03..3073c47bf78 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
index 88aa97da702..7ed2e71a7f6 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -62,11 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index b9057e9047d..84e4fbb59fb 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 510aa6730f0..46286c3f321 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
index 0aa720e4003..05f42b8b98e 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
@@ -21,11 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             XXXXXXX,      XXXXXXX, RGB_TOG
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index c2abd128430..7d6e267611f 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -76,11 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
     )
 };
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index 69b46130931..fb74825ef94 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "action_layer.h"
 #include <stdio.h>
 
 #define L_BASE 0
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 19ac7dfda2b..2e395f5e6a7 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -19,6 +19,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk
index 1d1f049a53d..cd2da2eedf3 100644
--- a/keyboards/lime/rules.mk
+++ b/keyboards/lime/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
 SWAP_HANDS_ENABLE = yes
 DEFAULT_FOLDER = lime/rev1
diff --git a/keyboards/longnald/corin/keymaps/default/keymap.c b/keyboards/longnald/corin/keymaps/default/keymap.c
index a16bfde7c25..9fcdaa222fb 100644
--- a/keyboards/longnald/corin/keymaps/default/keymap.c
+++ b/keyboards/longnald/corin/keymaps/default/keymap.c
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [2] = LAYOUT_64_ansi(
         KC_NO, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_G, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, KC_NO,
-        KC_NO, KC_NO, LAG_NRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, AG_LNRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LAG_SWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AG_LSWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
         MO(3), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
     ),
     [3] = LAYOUT_64_ansi(
diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json
deleted file mode 100644
index 7f4cfa8e94c..00000000000
--- a/keyboards/majistic/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "maJIStic",
-    "manufacturer": "yossiyossy",
-    "url": "https://github.com/yossiyossy/maJIStic",
-    "maintainer": "yossiyossy",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6E55",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-                "rows": ["D4", "C6", "D7", "E6", "B4"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 7.5, "y": 0},
-                {"matrix": [5, 1], "x": 8.5, "y": 0},
-                {"matrix": [5, 2], "x": 9.5, "y": 0},
-                {"matrix": [5, 3], "x": 10.5, "y": 0},
-                {"matrix": [5, 4], "x": 11.5, "y": 0},
-                {"matrix": [5, 5], "x": 12.5, "y": 0},
-                {"matrix": [5, 6], "x": 13.5, "y": 0},
-                {"matrix": [5, 7], "x": 14.5, "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": [6, 0], "x": 7, "y": 1},
-                {"matrix": [6, 1], "x": 8, "y": 1},
-                {"matrix": [6, 2], "x": 9, "y": 1},
-                {"matrix": [6, 3], "x": 10, "y": 1},
-                {"matrix": [6, 4], "x": 11, "y": 1},
-                {"matrix": [6, 5], "x": 12, "y": 1},
-                {"matrix": [6, 6], "x": 13, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 7.25, "y": 2},
-                {"matrix": [7, 1], "x": 8.25, "y": 2},
-                {"matrix": [7, 2], "x": 9.25, "y": 2},
-                {"matrix": [7, 3], "x": 10.25, "y": 2},
-                {"matrix": [7, 4], "x": 11.25, "y": 2},
-                {"matrix": [7, 5], "x": 12.25, "y": 2},
-                {"matrix": [7, 6], "x": 13.25, "y": 2},
-                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 7.75, "y": 3},
-                {"matrix": [8, 1], "x": 8.75, "y": 3},
-                {"matrix": [8, 2], "x": 9.75, "y": 3},
-                {"matrix": [8, 3], "x": 10.75, "y": 3},
-                {"matrix": [8, 4], "x": 11.75, "y": 3},
-                {"matrix": [8, 5], "x": 12.75, "y": 3},
-                {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75},
-
-                {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 3], "x": 11.75, "y": 4},
-                {"matrix": [9, 4], "x": 12.75, "y": 4},
-                {"matrix": [9, 5], "x": 13.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/majistic/keyboard.json b/keyboards/majistic/keyboard.json
new file mode 100644
index 00000000000..258df08d883
--- /dev/null
+++ b/keyboards/majistic/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "maJIStic",
+    "manufacturer": "yossiyossy",
+    "url": "https://github.com/yossiyossy/maJIStic",
+    "maintainer": "yossiyossy",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6E55",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+                "rows": ["D4", "C6", "D7", "E6", "B4"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 7.5, "y": 0},
+                {"matrix": [5, 1], "x": 8.5, "y": 0},
+                {"matrix": [5, 2], "x": 9.5, "y": 0},
+                {"matrix": [5, 3], "x": 10.5, "y": 0},
+                {"matrix": [5, 4], "x": 11.5, "y": 0},
+                {"matrix": [5, 5], "x": 12.5, "y": 0},
+                {"matrix": [5, 6], "x": 13.5, "y": 0},
+                {"matrix": [5, 7], "x": 14.5, "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": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [6, 6], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 7.25, "y": 2},
+                {"matrix": [7, 1], "x": 8.25, "y": 2},
+                {"matrix": [7, 2], "x": 9.25, "y": 2},
+                {"matrix": [7, 3], "x": 10.25, "y": 2},
+                {"matrix": [7, 4], "x": 11.25, "y": 2},
+                {"matrix": [7, 5], "x": 12.25, "y": 2},
+                {"matrix": [7, 6], "x": 13.25, "y": 2},
+                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3},
+                {"matrix": [8, 1], "x": 8.75, "y": 3},
+                {"matrix": [8, 2], "x": 9.75, "y": 3},
+                {"matrix": [8, 3], "x": 10.75, "y": 3},
+                {"matrix": [8, 4], "x": 11.75, "y": 3},
+                {"matrix": [8, 5], "x": 12.75, "y": 3},
+                {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75},
+
+                {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4},
+                {"matrix": [9, 4], "x": 12.75, "y": 4},
+                {"matrix": [9, 5], "x": 13.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk
deleted file mode 100644
index d7abef3ae35..00000000000
--- a/keyboards/majistic/rules.mk
+++ /dev/null
@@ -1,14 +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 backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 7a9aa305acb..6bbf3477dc0 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "tapping": {
diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk
index 78e2bfea04a..c2c363d51c3 100644
--- a/keyboards/malevolti/lyra/rev1/rules.mk
+++ b/keyboards/malevolti/lyra/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes 
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
deleted file mode 100644
index 86637d4b680..00000000000
--- a/keyboards/manta60/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "manta60",
-    "manufacturer": "kamonanban",
-    "url": "https://github.com/KamoNanban",
-    "maintainer": "kamonanban",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x991D",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "led_count": 68,
-        "split_count": [34, 34],
-        "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",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 6], "x": 10, "y": 0},
-                {"matrix": [5, 5], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 1], "x": 15, "y": 0},
-                {"matrix": [5, 0], "x": 16, "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": [6, 6], "x": 10, "y": 1},
-                {"matrix": [6, 5], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 2], "x": 14, "y": 1},
-                {"matrix": [6, 1], "x": 15, "y": 1},
-                {"matrix": [6, 0], "x": 16, "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": [7, 6], "x": 10, "y": 2},
-                {"matrix": [7, 5], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 2], "x": 14, "y": 2},
-                {"matrix": [7, 1], "x": 15, "y": 2},
-                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 3], "x": 13, "y": 3},
-                {"matrix": [8, 2], "x": 14, "y": 3},
-                {"matrix": [8, 1], "x": 15, "y": 3},
-                {"matrix": [8, 0], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 4, "y": 4},
-                {"matrix": [4, 3], "x": 5, "y": 4.25},
-                {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 2},
-                {"matrix": [4, 5], "x": 7, "y": 3.5},
-                {"matrix": [4, 6], "x": 7, "y": 4.5},
-
-                {"matrix": [9, 6], "x": 9, "y": 4.5},
-                {"matrix": [9, 5], "x": 9, "y": 3.5},
-                {"matrix": [9, 4], "x": 10, "y": 3.5, "h": 2},
-                {"matrix": [9, 3], "x": 11, "y": 4.25},
-                {"matrix": [9, 2], "x": 12, "y": 4},
-                {"matrix": [9, 1], "x": 15, "y": 4},
-                {"matrix": [9, 0], "x": 16, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/manta60/keyboard.json b/keyboards/manta60/keyboard.json
new file mode 100644
index 00000000000..8482970b9b2
--- /dev/null
+++ b/keyboards/manta60/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "manta60",
+    "manufacturer": "kamonanban",
+    "url": "https://github.com/KamoNanban",
+    "maintainer": "kamonanban",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x991D",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": false,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "led_count": 68,
+        "split_count": [34, 34],
+        "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",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 6], "x": 10, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "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": [6, 6], "x": 10, "y": 1},
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 1], "x": 15, "y": 1},
+                {"matrix": [6, 0], "x": 16, "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": [7, 6], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4},
+                {"matrix": [4, 3], "x": 5, "y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 2},
+                {"matrix": [4, 5], "x": 7, "y": 3.5},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 9, "y": 4.5},
+                {"matrix": [9, 5], "x": 9, "y": 3.5},
+                {"matrix": [9, 4], "x": 10, "y": 3.5, "h": 2},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 1], "x": 15, "y": 4},
+                {"matrix": [9, 0], "x": 16, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk
deleted file mode 100644
index 31ff5c952c5..00000000000
--- a/keyboards/manta60/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # 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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-
-IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad, iPhone)
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 2b77267da81..6b680418df3 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -36,6 +36,7 @@
         "pin": "B2"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
index 4c5d9f9e5d4..8e8d4c13b6c 100644
--- a/keyboards/maple_computing/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
index d71e5b6e559..39ebffd9875 100644
--- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
@@ -13,8 +13,7 @@ enum layer_names {
 };
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -114,22 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
 
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index e42ec5a08df..6f3a0dd1fca 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D0"
   },
   "processor": "atmega32u4",
diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
index 4cf751c4931..64efe315122 100644
--- a/keyboards/maple_computing/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
index 87190f0b3f1..6ef57fd895a 100644
--- a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
@@ -9,12 +9,6 @@
 #define _FN_1 1
 #define _FN_2 2
 
-enum custom_keycodes {
-  DEFAULT = SAFE_RANGE,
-  FN_1,
-  FN_2
-};
-
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
@@ -49,15 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 
 };
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // NONE
-  }
-  return true;
-}
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c
index 613798c941e..4a0ca72e89f 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.c
+++ b/keyboards/marksard/rhymestone/common/oled_helper.c
@@ -1,9 +1,11 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "host.h"
+#include "progmem.h"
 #include <stdio.h>
 #include <string.h>
 
 #ifdef OLED_ENABLE
+#include "oled_driver.h"
 
 void render_logo(void) {
 
diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
index bc474f08817..31eb063c030 100644
--- a/keyboards/marksard/rhymestone/rev1/keyboard.json
+++ b/keyboards/marksard/rhymestone/rev1/keyboard.json
@@ -22,6 +22,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "ws2812": {
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index 6f15328b5a4..477a0a7da73 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 
 DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index e9a8cf564a3..66124abe120 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -1,5 +1,7 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "oled_driver.h"
+#include "host.h"
+#include "rgblight.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json
index 5c13e5b15c5..07ad96140d9 100644
--- a/keyboards/marksard/treadstone48/rev1/keyboard.json
+++ b/keyboards/marksard/treadstone48/rev1/keyboard.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "ws2812": {
diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
index d29d9074a01..3bbd2614291 100644
--- a/keyboards/marksard/treadstone48/rev2/rules.mk
+++ b/keyboards/marksard/treadstone48/rev2/rules.mk
@@ -1 +1 @@
-SPLIT_KEYBOARD = no
+# File intentionally blank
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index e9a2de4c251..dddb6f07296 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -8,7 +8,6 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
 
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
diff --git a/keyboards/matrix/abelx/matrix.c b/keyboards/matrix/abelx/matrix.c
index d8d87b7d895..d74ed957751 100644
--- a/keyboards/matrix/abelx/matrix.c
+++ b/keyboards/matrix/abelx/matrix.c
@@ -17,10 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "quantum.h"
 #include "matrix.h"
 #include "tca6424.h"
 #include "abelx.h"
diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c
index 9c36153da10..c127aa35b90 100644
--- a/keyboards/matrix/m12og/rev1/matrix.c
+++ b/keyboards/matrix/m12og/rev1/matrix.c
@@ -14,12 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/matrix/m20add/matrix.c b/keyboards/matrix/m20add/matrix.c
index e9ddbdff62b..85f5863725b 100644
--- a/keyboards/matrix/m20add/matrix.c
+++ b/keyboards/matrix/m20add/matrix.c
@@ -2,10 +2,6 @@
  * matrix.c
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "quantum.h"
 #include "matrix.h"
 #include "tca6424.h"
 #include "m20add.h"
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index f32875cf4f7..ecdac9130a6 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -18,9 +18,13 @@
 
 #include "rgb_ring.h"
 
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include "quantum.h"
 #include "rgblight.h"
+#include "timer.h"
+#include "action.h"
 #include "drivers/led/issi/is31fl3731.h"
 #include "i2c_master.h"
 
diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c
index 90e7006b785..14e8188cb58 100644
--- a/keyboards/matrix/noah/matrix.c
+++ b/keyboards/matrix/noah/matrix.c
@@ -2,16 +2,10 @@
  * matrix.c
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <hal.h>
-#include "quantum.h"
+#include "matrix.h"
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
-#include "matrix.h"
 
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
@@ -167,16 +161,16 @@ matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
 
 void matrix_print(void)
 {
-    printf("\nr/c 01234567\n");
+    xprintf("\nr/c 01234567\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        printf("%X0: ", row);
+        xprintf("%X0: ", row);
         matrix_row_t data = matrix_get_row(row);
         for (int col = 0; col < MATRIX_COLS; col++) {
             if (data & (1<<col))
-                printf("1");
+                xprintf("1");
             else
-                printf("0");
+                xprintf("0");
         }
-        printf("\n");
+        xprintf("\n");
     }
 }
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
index 37046790feb..864de5e6603 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #ifdef DIRECT_PINS
 static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechlovin/infinity87/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c
index b1b0d20654c..62a56f687cb 100644
--- a/keyboards/mechlovin/infinity87/rev2/matrix.c
+++ b/keyboards/mechlovin/infinity87/rev2/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #ifdef DIRECT_PINS
 static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c
index b1b0d20654c..62a56f687cb 100644
--- a/keyboards/mechlovin/infinity875/matrix.c
+++ b/keyboards/mechlovin/infinity875/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #ifdef DIRECT_PINS
 static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
index c01879c9a54..2abda55d0e8 100644
--- a/keyboards/mechlovin/olly/jf/rev1/matrix.c
+++ b/keyboards/mechlovin/olly/jf/rev1/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #ifdef DIRECT_PINS
 static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechlovin/serratus/matrix.c b/keyboards/mechlovin/serratus/matrix.c
index b1b0d20654c..62a56f687cb 100644
--- a/keyboards/mechlovin/serratus/matrix.c
+++ b/keyboards/mechlovin/serratus/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #ifdef DIRECT_PINS
 static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/info.json
new file mode 100644
index 00000000000..7f761a2e119
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/info.json
@@ -0,0 +1,402 @@
+{
+    "manufacturer": "Mech Studio",
+    "keyboard_name": "Chapter 1",
+    "maintainer": "Cheezi0747",
+    "bootloader": "qmk-dfu",
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F7"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "caps_word": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B3", "F4", "F5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["F1", "F0", "E6", "B1", "B2"]
+    },
+    "processor": "atmega32u4",
+    "qmk_lufa_bootloader": {
+        "esc_input": "B3",
+        "esc_output": "F1"
+    },
+    "url": "https://rooke.myportfolio.com/chapter-165-1",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0006",
+        "vid": "0x4D53"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "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": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "ISO \\", "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": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "ISO \\", "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": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "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": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 1},
+                {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+                {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+                {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechstudio/chapter1/keymaps/default/keymap.c b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..38508b2b031
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Linus Sjölinder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+        KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_DEL,  KC_MPLY,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP,   _______,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL         , KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}
+};
+#endif
diff --git a/keyboards/mechstudio/chapter1/keymaps/default/rules.mk b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechstudio/chapter1/keymaps/via/keymap.c b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6811aca06c6
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2024 Linus Sjölinder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+        KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_DEL,  KC_MPLY,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP,   _______,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL         , KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}
+};
+#endif
diff --git a/keyboards/mechstudio/chapter1/keymaps/via/rules.mk b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechstudio/chapter1/readme.md b/keyboards/mechstudio/chapter1/readme.md
new file mode 100644
index 00000000000..eb52f8eb49a
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/readme.md
@@ -0,0 +1,29 @@
+# Chapter 1
+
+A exploded 65% with a rotary encoder designed by Rooke Design
+
+![Chapter-1](https://i.imgur.com/GNI5KdW.jpeg)
+
+## Support
+
+-   Keyboard Maintainer: [Cheezi](https://github.com/cheezi747)
+-   Hardware Supported: Chapter-1
+-   Hardware Availability: [Rooke Design](https://rooke.myportfolio.com/chapter-165-1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechstudio/chapter1:default
+
+Flashing example for this keyboard:
+
+    make mechstudio/chapter1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+-   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/mechstudio/chapter1/rules.mk
similarity index 100%
rename from keyboards/canary/canary60rgb/v1/rules.mk
rename to keyboards/mechstudio/chapter1/rules.mk
diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json
index 104e42483c2..7ab58982586 100644
--- a/keyboards/mechwild/bb40/keymaps/default/keymap.json
+++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-   "keyboard": "mechwild/bb40",
+   "keyboard": "mechwild/bb40/f401",
    "keymap": "default",
    "version": 1,
    "layout": "LAYOUT_all",
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 7289147e6b5..ccc2d02b637 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -22,6 +22,7 @@
         "tap_keycode_delay": 10
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3",
         "transport": {
             "sync": {
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
index 875d4311681..1a9045155ba 100644
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-SPLIT_KEYBOARD = yes        # Define split functionality
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index da82447980f..5b22023cce3 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -22,6 +22,7 @@
         "tap_keycode_delay": 10
     },
     "split": {
+        "enabled": true
         "soft_serial_pin": "D3",
         "transport": {
             "sync": {
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
index 875d4311681..1a9045155ba 100644
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable encoder
 OLED_ENABLE = yes           # Enable OLED Screen
-SPLIT_KEYBOARD = yes        # Define split functionality
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj61/rev1/keyboard.json b/keyboards/melgeek/mj61/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj61/rev1/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj61/rev2/keyboard.json b/keyboards/melgeek/mj61/rev2/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj61/rev2/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj63/rev1/keyboard.json b/keyboards/melgeek/mj63/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj63/rev1/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj63/rev2/keyboard.json b/keyboards/melgeek/mj63/rev2/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj63/rev2/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev1/keyboard.json b/keyboards/melgeek/mj64/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj64/rev1/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev2/keyboard.json b/keyboards/melgeek/mj64/rev2/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj64/rev2/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "matrix_pins": {
-        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev3/keyboard.json b/keyboards/melgeek/mj64/rev3/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev3/keyboard.json
@@ -0,0 +1,16 @@
+{
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk
deleted file mode 100644
index 30e3240a944..00000000000
--- a/keyboards/melgeek/mj64/rev3/rules.mk
+++ /dev/null
@@ -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
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json
deleted file mode 100644
index 773c9a31984..00000000000
--- a/keyboards/melgeek/mj65/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "keyboard_name": "MJ65",
-    "manufacturer": "MelGeek",
-    "url": "",
-    "maintainer": "melgeek001365",
-    "usb": {
-        "vid": "0xEDED",
-        "pid": "0x0065",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "solid_splash": true
-        },
-        "default": {
-            "animation": "cycle_all"
-        },
-        "driver": "is31fl3741",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
-        "rows": ["B12", "B11", "B10", "B1", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C",
-    "debounce": 3,
-    "community_layouts": ["65_ansi"],
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/rev3/config.h
similarity index 100%
rename from keyboards/melgeek/mj65/config.h
rename to keyboards/melgeek/mj65/rev3/config.h
diff --git a/keyboards/melgeek/mj65/rev3/keyboard.json b/keyboards/melgeek/mj65/rev3/keyboard.json
new file mode 100644
index 00000000000..adf0ef94bc6
--- /dev/null
+++ b/keyboards/melgeek/mj65/rev3/keyboard.json
@@ -0,0 +1,157 @@
+{
+    "keyboard_name": "MJ65",
+    "manufacturer": "MelGeek",
+    "url": "",
+    "maintainer": "melgeek001365",
+    "usb": {
+        "vid": "0xEDED",
+        "pid": "0x0065",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true
+        },
+        "default": {
+            "animation": "cycle_all"
+        },
+        "driver": "is31fl3741",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"],
+        "rows": ["B12", "B11", "B10", "B1", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C",
+    "debounce": 3,
+    "community_layouts": ["65_ansi"],
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk
index b3984d93c02..8b7f40c50b5 100644
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED   = no
 BACKLIGHT_SUPPORTED  = no
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index 960bf58c52f..829eb63fe6b 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -16,4 +16,7 @@
 
 #pragma once
 
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN B7
+
 #define DRIVER_INDICATOR_LED_TOTAL 3
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/rev1/keyboard.json
similarity index 100%
rename from keyboards/melgeek/mojo68/info.json
rename to keyboards/melgeek/mojo68/rev1/keyboard.json
diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk
deleted file mode 100755
index 6e7633bfe01..00000000000
--- a/keyboards/melgeek/mojo68/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/rev1/config.h
similarity index 100%
rename from keyboards/melgeek/mojo75/config.h
rename to keyboards/melgeek/mojo75/rev1/config.h
diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/rev1/keyboard.json
similarity index 100%
rename from keyboards/melgeek/mojo75/info.json
rename to keyboards/melgeek/mojo75/rev1/keyboard.json
diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/melgeek/mojo75/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h
deleted file mode 100755
index 68088ba7453..00000000000
--- a/keyboards/melgeek/tegic/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define IS31FL3741_SDB_PIN B7
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/tegic/rev1/config.h
similarity index 100%
rename from keyboards/melgeek/mojo68/config.h
rename to keyboards/melgeek/tegic/rev1/config.h
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/rev1/keyboard.json
similarity index 100%
rename from keyboards/melgeek/tegic/info.json
rename to keyboards/melgeek/tegic/rev1/keyboard.json
diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk
deleted file mode 100755
index 6e7633bfe01..00000000000
--- a/keyboards/melgeek/tegic/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/rev1/config.h
similarity index 100%
rename from keyboards/melgeek/z70ultra/config.h
rename to keyboards/melgeek/z70ultra/rev1/config.h
diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/rev1/keyboard.json
similarity index 100%
rename from keyboards/melgeek/z70ultra/info.json
rename to keyboards/melgeek/z70ultra/rev1/keyboard.json
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/rev1/rev1.c
similarity index 100%
rename from keyboards/melgeek/z70ultra/z70ultra.c
rename to keyboards/melgeek/z70ultra/rev1/rev1.c
diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/melgeek/z70ultra/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
deleted file mode 100644
index 9c120b92247..00000000000
--- a/keyboards/merge/um70/info.json
+++ /dev/null
@@ -1,411 +0,0 @@
-{
-    "keyboard_name": "UM-70",
-    "manufacturer": "Merge",
-    "url": "https://mergedesign.store/um-70",
-    "maintainer": "duoshock",
-    "usb": {
-        "vid": "0x4D65",
-        "pid": "0x3222",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
-        "rows": ["B0", "B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgb_matrix": {
-        "driver": "ws2812",
-        "split_count": [39, 44]
-    },
-    "rgblight": {
-        "led_count": 83,
-        "max_brightness": 150,
-        "sleep": true,
-        "split_count": [39, 44]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_rspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 0},
-                {"matrix": [5, 1], "x": 10.25, "y": 0},
-                {"matrix": [5, 2], "x": 11.25, "y": 0},
-                {"matrix": [5, 3], "x": 12.25, "y": 0},
-                {"matrix": [5, 4], "x": 13.25, "y": 0},
-                {"matrix": [5, 5], "x": 14.25, "y": 0},
-                {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 8.75, "y": 1},
-                {"matrix": [6, 1], "x": 9.75, "y": 1},
-                {"matrix": [6, 2], "x": 10.75, "y": 1},
-                {"matrix": [6, 3], "x": 11.75, "y": 1},
-                {"matrix": [6, 4], "x": 12.75, "y": 1},
-                {"matrix": [6, 5], "x": 13.75, "y": 1},
-                {"matrix": [6, 6], "x": 14.75, "y": 1},
-                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 17.75, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 9, "y": 2},
-                {"matrix": [7, 1], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2},
-                {"matrix": [7, 4], "x": 13, "y": 2},
-                {"matrix": [7, 5], "x": 14, "y": 2},
-                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 3},
-                {"matrix": [8, 1], "x": 10.5, "y": 3},
-                {"matrix": [8, 2], "x": 11.5, "y": 3},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 4], "x": 13.5, "y": 3},
-                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
-            ]
-        },
-        "LAYOUT_rspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 0},
-                {"matrix": [5, 1], "x": 10.25, "y": 0},
-                {"matrix": [5, 2], "x": 11.25, "y": 0},
-                {"matrix": [5, 3], "x": 12.25, "y": 0},
-                {"matrix": [5, 4], "x": 13.25, "y": 0},
-                {"matrix": [5, 5], "x": 14.25, "y": 0},
-                {"matrix": [5, 6], "x": 15.25, "y": 0},
-                {"matrix": [5, 7], "x": 16.25, "y": 0},
-
-                {"matrix": [7, 7], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 8.75, "y": 1},
-                {"matrix": [6, 1], "x": 9.75, "y": 1},
-                {"matrix": [6, 2], "x": 10.75, "y": 1},
-                {"matrix": [6, 3], "x": 11.75, "y": 1},
-                {"matrix": [6, 4], "x": 12.75, "y": 1},
-                {"matrix": [6, 5], "x": 13.75, "y": 1},
-                {"matrix": [6, 6], "x": 14.75, "y": 1},
-                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 17.75, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 9, "y": 2},
-                {"matrix": [7, 1], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2},
-                {"matrix": [7, 4], "x": 13, "y": 2},
-                {"matrix": [7, 5], "x": 14, "y": 2},
-                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 3},
-                {"matrix": [8, 1], "x": 10.5, "y": 3},
-                {"matrix": [8, 2], "x": 11.5, "y": 3},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 4], "x": 13.5, "y": 3},
-                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
-            ]
-        },
-        "LAYOUT_lspace_2u_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 0},
-                {"matrix": [5, 1], "x": 10.25, "y": 0},
-                {"matrix": [5, 2], "x": 11.25, "y": 0},
-                {"matrix": [5, 3], "x": 12.25, "y": 0},
-                {"matrix": [5, 4], "x": 13.25, "y": 0},
-                {"matrix": [5, 5], "x": 14.25, "y": 0},
-                {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
-
-                {"matrix": [7, 7], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 8.75, "y": 1},
-                {"matrix": [6, 1], "x": 9.75, "y": 1},
-                {"matrix": [6, 2], "x": 10.75, "y": 1},
-                {"matrix": [6, 3], "x": 11.75, "y": 1},
-                {"matrix": [6, 4], "x": 12.75, "y": 1},
-                {"matrix": [6, 5], "x": 13.75, "y": 1},
-                {"matrix": [6, 6], "x": 14.75, "y": 1},
-                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 17.75, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 9, "y": 2},
-                {"matrix": [7, 1], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2},
-                {"matrix": [7, 4], "x": 13, "y": 2},
-                {"matrix": [7, 5], "x": 14, "y": 2},
-                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 3},
-                {"matrix": [8, 1], "x": 10.5, "y": 3},
-                {"matrix": [8, 2], "x": 11.5, "y": 3},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 4], "x": 13.5, "y": 3},
-                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
-            ]
-        },
-        "LAYOUT_lspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 3], "x": 4.5, "y": 0},
-                {"matrix": [0, 4], "x": 5.5, "y": 0},
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.25, "y": 0},
-                {"matrix": [5, 1], "x": 10.25, "y": 0},
-                {"matrix": [5, 2], "x": 11.25, "y": 0},
-                {"matrix": [5, 3], "x": 12.25, "y": 0},
-                {"matrix": [5, 4], "x": 13.25, "y": 0},
-                {"matrix": [5, 5], "x": 14.25, "y": 0},
-                {"matrix": [5, 6], "x": 15.25, "y": 0},
-                {"matrix": [5, 7], "x": 16.25, "y": 0},
-
-                {"matrix": [7, 7], "x": 17.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1},
-                {"matrix": [1, 3], "x": 5, "y": 1},
-                {"matrix": [1, 4], "x": 6, "y": 1},
-                {"matrix": [1, 5], "x": 7, "y": 1},
-
-                {"matrix": [6, 0], "x": 8.75, "y": 1},
-                {"matrix": [6, 1], "x": 9.75, "y": 1},
-                {"matrix": [6, 2], "x": 10.75, "y": 1},
-                {"matrix": [6, 3], "x": 11.75, "y": 1},
-                {"matrix": [6, 4], "x": 12.75, "y": 1},
-                {"matrix": [6, 5], "x": 13.75, "y": 1},
-                {"matrix": [6, 6], "x": 14.75, "y": 1},
-                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
-                {"matrix": [8, 7], "x": 17.75, "y": 1},
-
-                {"matrix": [4, 5], "x": 0, "y": 2},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3.25, "y": 2},
-                {"matrix": [2, 2], "x": 4.25, "y": 2},
-                {"matrix": [2, 3], "x": 5.25, "y": 2},
-                {"matrix": [2, 4], "x": 6.25, "y": 2},
-                {"matrix": [2, 5], "x": 7.25, "y": 2},
-
-                {"matrix": [7, 0], "x": 9, "y": 2},
-                {"matrix": [7, 1], "x": 10, "y": 2},
-                {"matrix": [7, 2], "x": 11, "y": 2},
-                {"matrix": [7, 3], "x": 12, "y": 2},
-                {"matrix": [7, 4], "x": 13, "y": 2},
-                {"matrix": [7, 5], "x": 14, "y": 2},
-                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
-                {"matrix": [9, 7], "x": 17.75, "y": 2},
-
-                {"matrix": [4, 6], "x": 0, "y": 3},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.75, "y": 3},
-                {"matrix": [3, 2], "x": 4.75, "y": 3},
-                {"matrix": [3, 3], "x": 5.75, "y": 3},
-                {"matrix": [3, 4], "x": 6.75, "y": 3},
-                {"matrix": [3, 5], "x": 7.75, "y": 3},
-
-                {"matrix": [8, 0], "x": 9.5, "y": 3},
-                {"matrix": [8, 1], "x": 10.5, "y": 3},
-                {"matrix": [8, 2], "x": 11.5, "y": 3},
-                {"matrix": [8, 3], "x": 12.5, "y": 3},
-                {"matrix": [8, 4], "x": 13.5, "y": 3},
-                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
-                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
-                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
-                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
-                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/merge/um70/keyboard.json b/keyboards/merge/um70/keyboard.json
new file mode 100644
index 00000000000..c349abc7881
--- /dev/null
+++ b/keyboards/merge/um70/keyboard.json
@@ -0,0 +1,423 @@
+{
+    "keyboard_name": "UM-70",
+    "manufacturer": "Merge",
+    "url": "https://mergedesign.store/um-70",
+    "maintainer": "duoshock",
+    "usb": {
+        "vid": "0x4D65",
+        "pid": "0x3222",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "split_count": [39, 44]
+    },
+    "rgblight": {
+        "led_count": 83,
+        "max_brightness": 150,
+        "sleep": true,
+        "split_count": [39, 44]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_rspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 0},
+                {"matrix": [5, 1], "x": 10.25, "y": 0},
+                {"matrix": [5, 2], "x": 11.25, "y": 0},
+                {"matrix": [5, 3], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 5], "x": 14.25, "y": 0},
+                {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.75, "y": 1},
+                {"matrix": [6, 1], "x": 9.75, "y": 1},
+                {"matrix": [6, 2], "x": 10.75, "y": 1},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 4], "x": 12.75, "y": 1},
+                {"matrix": [6, 5], "x": 13.75, "y": 1},
+                {"matrix": [6, 6], "x": 14.75, "y": 1},
+                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 3},
+                {"matrix": [8, 1], "x": 10.5, "y": 3},
+                {"matrix": [8, 2], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+            ]
+        },
+        "LAYOUT_rspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 0},
+                {"matrix": [5, 1], "x": 10.25, "y": 0},
+                {"matrix": [5, 2], "x": 11.25, "y": 0},
+                {"matrix": [5, 3], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 5], "x": 14.25, "y": 0},
+                {"matrix": [5, 6], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.75, "y": 1},
+                {"matrix": [6, 1], "x": 9.75, "y": 1},
+                {"matrix": [6, 2], "x": 10.75, "y": 1},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 4], "x": 12.75, "y": 1},
+                {"matrix": [6, 5], "x": 13.75, "y": 1},
+                {"matrix": [6, 6], "x": 14.75, "y": 1},
+                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 3},
+                {"matrix": [8, 1], "x": 10.5, "y": 3},
+                {"matrix": [8, 2], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+            ]
+        },
+        "LAYOUT_lspace_2u_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 0},
+                {"matrix": [5, 1], "x": 10.25, "y": 0},
+                {"matrix": [5, 2], "x": 11.25, "y": 0},
+                {"matrix": [5, 3], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 5], "x": 14.25, "y": 0},
+                {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.75, "y": 1},
+                {"matrix": [6, 1], "x": 9.75, "y": 1},
+                {"matrix": [6, 2], "x": 10.75, "y": 1},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 4], "x": 12.75, "y": 1},
+                {"matrix": [6, 5], "x": 13.75, "y": 1},
+                {"matrix": [6, 6], "x": 14.75, "y": 1},
+                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 3},
+                {"matrix": [8, 1], "x": 10.5, "y": 3},
+                {"matrix": [8, 2], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+            ]
+        },
+        "LAYOUT_lspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.25, "y": 0},
+                {"matrix": [5, 1], "x": 10.25, "y": 0},
+                {"matrix": [5, 2], "x": 11.25, "y": 0},
+                {"matrix": [5, 3], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 5], "x": 14.25, "y": 0},
+                {"matrix": [5, 6], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.75, "y": 1},
+                {"matrix": [6, 1], "x": 9.75, "y": 1},
+                {"matrix": [6, 2], "x": 10.75, "y": 1},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 4], "x": 12.75, "y": 1},
+                {"matrix": [6, 5], "x": 13.75, "y": 1},
+                {"matrix": [6, 6], "x": 14.75, "y": 1},
+                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 3},
+                {"matrix": [8, 1], "x": 10.5, "y": 3},
+                {"matrix": [8, 2], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+                {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
deleted file mode 100644
index 11776618e22..00000000000
--- a/keyboards/merge/um70/rules.mk
+++ /dev/null
@@ -1,15 +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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
deleted file mode 100644
index 554d1997a36..00000000000
--- a/keyboards/merge/um80/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-    "keyboard_name": "UM-80",
-    "manufacturer": "Merge",
-    "url": "https://mergedesign.store/um-80",
-    "maintainer": "duoshock",
-    "usb": {
-        "vid": "0x4D65",
-        "pid": "0x3241",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
-        "rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 100,
-        "max_brightness": 120,
-        "sleep": true,
-        "split_count": [48, 52]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_rspace_split_bksp": {
-            "layout": [
-                {"matrix": [0, 0], "x": 1.5, "y": 0},
-
-                {"matrix": [0, 1], "x": 2.75, "y": 0},
-                {"matrix": [0, 2], "x": 3.75, "y": 0},
-                {"matrix": [0, 3], "x": 4.75, "y": 0},
-                {"matrix": [0, 4], "x": 5.75, "y": 0},
-
-                {"matrix": [0, 5], "x": 7, "y": 0},
-                {"matrix": [0, 6], "x": 8, "y": 0},
-
-                {"matrix": [6, 0], "x": 10.25, "y": 0},
-                {"matrix": [6, 1], "x": 11.25, "y": 0},
-
-                {"matrix": [6, 2], "x": 12.5, "y": 0},
-                {"matrix": [6, 3], "x": 13.5, "y": 0},
-                {"matrix": [6, 4], "x": 14.5, "y": 0},
-                {"matrix": [6, 5], "x": 15.5, "y": 0},
-
-                {"matrix": [6, 6], "x": 16.75, "y": 0},
-
-                {"matrix": [6, 7], "x": 18.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
-                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
-                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
-                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
-
-                {"matrix": [7, 0], "x": 9.75, "y": 1.25},
-                {"matrix": [7, 1], "x": 10.75, "y": 1.25},
-                {"matrix": [7, 2], "x": 11.75, "y": 1.25},
-                {"matrix": [7, 3], "x": 12.75, "y": 1.25},
-                {"matrix": [7, 4], "x": 13.75, "y": 1.25},
-                {"matrix": [7, 5], "x": 14.75, "y": 1.25},
-                {"matrix": [7, 6], "x": 15.75, "y": 1.25},
-                {"matrix": [7, 7], "x": 16.75, "y": 1.25},
-
-                {"matrix": [9, 7], "x": 18.25, "y": 1.25},
-
-                {"matrix": [2, 7], "x": 0, "y": 2.25},
-
-                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 3, "y": 2.25},
-                {"matrix": [2, 2], "x": 4, "y": 2.25},
-                {"matrix": [2, 3], "x": 5, "y": 2.25},
-                {"matrix": [2, 4], "x": 6, "y": 2.25},
-                {"matrix": [2, 5], "x": 7, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 9.25, "y": 2.25},
-                {"matrix": [8, 1], "x": 10.25, "y": 2.25},
-                {"matrix": [8, 2], "x": 11.25, "y": 2.25},
-                {"matrix": [8, 3], "x": 12.25, "y": 2.25},
-                {"matrix": [8, 4], "x": 13.25, "y": 2.25},
-                {"matrix": [8, 5], "x": 14.25, "y": 2.25},
-                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
-                {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
-
-                {"matrix": [10, 7], "x": 18.25, "y": 2.25},
-
-                {"matrix": [3, 7], "x": 0, "y": 3.25},
-
-                {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
-
-                {"matrix": [9, 0], "x": 9.5, "y": 3.25},
-                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
-                {"matrix": [9, 2], "x": 11.5, "y": 3.25},
-                {"matrix": [9, 3], "x": 12.5, "y": 3.25},
-                {"matrix": [9, 4], "x": 13.5, "y": 3.25},
-                {"matrix": [9, 5], "x": 14.5, "y": 3.25},
-                {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
-
-                {"matrix": [11, 7], "x": 18.25, "y": 3.25},
-
-                {"matrix": [4, 7], "x": 0, "y": 4.25},
-
-                {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4.25},
-                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
-                {"matrix": [4, 4], "x": 6.75, "y": 4.25},
-                {"matrix": [4, 5], "x": 7.75, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 10, "y": 4.25},
-                {"matrix": [10, 1], "x": 11, "y": 4.25},
-                {"matrix": [10, 2], "x": 12, "y": 4.25},
-                {"matrix": [10, 3], "x": 13, "y": 4.25},
-                {"matrix": [10, 4], "x": 14, "y": 4.25},
-                {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
-
-                {"matrix": [11, 6], "x": 17, "y": 4.5},
-
-                {"matrix": [5, 7], "x": 0, "y": 5.25},
-
-                {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
-
-                {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
-                {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
-
-                {"matrix": [11, 3], "x": 16, "y": 5.5},
-                {"matrix": [11, 4], "x": 17, "y": 5.5},
-                {"matrix": [11, 5], "x": 18, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/merge/um80/keyboard.json b/keyboards/merge/um80/keyboard.json
new file mode 100644
index 00000000000..5a369877f88
--- /dev/null
+++ b/keyboards/merge/um80/keyboard.json
@@ -0,0 +1,166 @@
+{
+    "keyboard_name": "UM-80",
+    "manufacturer": "Merge",
+    "url": "https://mergedesign.store/um-80",
+    "maintainer": "duoshock",
+    "usb": {
+        "vid": "0x4D65",
+        "pid": "0x3241",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 100,
+        "max_brightness": 120,
+        "sleep": true,
+        "split_count": [48, 52]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_rspace_split_bksp": {
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 0},
+                {"matrix": [6, 1], "x": 11.25, "y": 0},
+
+                {"matrix": [6, 2], "x": 12.5, "y": 0},
+                {"matrix": [6, 3], "x": 13.5, "y": 0},
+                {"matrix": [6, 4], "x": 14.5, "y": 0},
+                {"matrix": [6, 5], "x": 15.5, "y": 0},
+
+                {"matrix": [6, 6], "x": 16.75, "y": 0},
+
+                {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 1.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 1.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 1.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 1.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 1.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 1.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 1.25},
+
+                {"matrix": [9, 7], "x": 18.25, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 9.25, "y": 2.25},
+                {"matrix": [8, 1], "x": 10.25, "y": 2.25},
+                {"matrix": [8, 2], "x": 11.25, "y": 2.25},
+                {"matrix": [8, 3], "x": 12.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 13.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 14.25, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 18.25, "y": 2.25},
+
+                {"matrix": [3, 7], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [9, 0], "x": 9.5, "y": 3.25},
+                {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+                {"matrix": [9, 2], "x": 11.5, "y": 3.25},
+                {"matrix": [9, 3], "x": 12.5, "y": 3.25},
+                {"matrix": [9, 4], "x": 13.5, "y": 3.25},
+                {"matrix": [9, 5], "x": 14.5, "y": 3.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
+
+                {"matrix": [11, 7], "x": 18.25, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 4.25},
+                {"matrix": [10, 1], "x": 11, "y": 4.25},
+                {"matrix": [10, 2], "x": 12, "y": 4.25},
+                {"matrix": [10, 3], "x": 13, "y": 4.25},
+                {"matrix": [10, 4], "x": 14, "y": 4.25},
+                {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
+
+                {"matrix": [11, 6], "x": 17, "y": 4.5},
+
+                {"matrix": [5, 7], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 3], "x": 16, "y": 5.5},
+                {"matrix": [11, 4], "x": 17, "y": 5.5},
+                {"matrix": [11, 5], "x": 18, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/merge/um80/keymaps/default/keymap.c b/keyboards/merge/um80/keymaps/default/keymap.c
index 04dea2c1be2..cfd628e300d 100644
--- a/keyboards/merge/um80/keymaps/default/keymap.c
+++ b/keyboards/merge/um80/keymaps/default/keymap.c
@@ -41,31 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_1,   KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T,                     KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSLS,   KC_PGUP,
     KC_2,   KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,                     KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,    KC_ENT,         KC_PGDN,
     KC_3,   KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,                     KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,                   KC_UP,
-    KC_4,   KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC,                   KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[1] = LAYOUT_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS
-),
-[2] = LAYOUT_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS
-),
-[3] = LAYOUT_rspace_split_bksp(
-               KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
-               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
-    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS
+    KC_4,   KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC,                   KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
 ),
 };
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
deleted file mode 100644
index 11776618e22..00000000000
--- a/keyboards/merge/um80/rules.mk
+++ /dev/null
@@ -1,15 +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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 7de7cd251f1..6413480391e 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -22,6 +22,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
index 8bd01d2bb4c..e146f96ce6f 100644
--- a/keyboards/merge/uma/rules.mk
+++ b/keyboards/merge/uma/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
 OLED_ENABLE = yes
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
deleted file mode 100644
index 55b4591f1fb..00000000000
--- a/keyboards/meson/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-    "keyboard_name": "Meson",
-    "manufacturer": "Luciano M",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x0000",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-      "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
-      "rows": ["F7", "C6", "F6", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-      "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-      "saturation_steps": 8,
-      "brightness_steps": 8,
-      "led_count": 10,
-      "sleep": true,
-      "split_count": [5, 5],
-      "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"
-    },
-    "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": [4, 6], "x": 8.5, "y": 0},
-          {"matrix": [4, 5], "x": 9.5, "y": 0},
-          {"matrix": [4, 4], "x": 10.5, "y": 0},
-          {"matrix": [4, 3], "x": 11.5, "y": 0},
-          {"matrix": [4, 2], "x": 12.5, "y": 0},
-          {"matrix": [4, 1], "x": 13.5, "y": 0},
-          {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
-          {"matrix": [5, 5], "x": 9.5, "y": 1},
-          {"matrix": [5, 4], "x": 10.5, "y": 1},
-          {"matrix": [5, 3], "x": 11.5, "y": 1},
-          {"matrix": [5, 2], "x": 12.5, "y": 1},
-          {"matrix": [5, 1], "x": 13.5, "y": 1},
-          {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
-          {"matrix": [6, 5], "x": 9.5, "y": 2},
-          {"matrix": [6, 4], "x": 10.5, "y": 2},
-          {"matrix": [6, 3], "x": 11.5, "y": 2},
-          {"matrix": [6, 2], "x": 12.5, "y": 2},
-          {"matrix": [6, 1], "x": 13.5, "y": 2},
-          {"matrix": [6, 0], "x": 14.5, "y": 2},
-
-          {"matrix": [3, 4], "x": 4, "y": 3},
-          {"matrix": [3, 5], "x": 5, "y": 3},
-          {"matrix": [7, 5], "x": 9.5, "y": 3},
-          {"matrix": [7, 4], "x": 10.5, "y": 3}
-        ]
-      },
-      "LAYOUT_2u": {
-        "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": [4, 6], "x": 8.5, "y": 0},
-          {"matrix": [4, 5], "x": 9.5, "y": 0},
-          {"matrix": [4, 4], "x": 10.5, "y": 0},
-          {"matrix": [4, 3], "x": 11.5, "y": 0},
-          {"matrix": [4, 2], "x": 12.5, "y": 0},
-          {"matrix": [4, 1], "x": 13.5, "y": 0},
-          {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
-          {"matrix": [5, 5], "x": 9.5, "y": 1},
-          {"matrix": [5, 4], "x": 10.5, "y": 1},
-          {"matrix": [5, 3], "x": 11.5, "y": 1},
-          {"matrix": [5, 2], "x": 12.5, "y": 1},
-          {"matrix": [5, 1], "x": 13.5, "y": 1},
-          {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
-          {"matrix": [6, 5], "x": 9.5, "y": 2},
-          {"matrix": [6, 4], "x": 10.5, "y": 2},
-          {"matrix": [6, 3], "x": 11.5, "y": 2},
-          {"matrix": [6, 2], "x": 12.5, "y": 2},
-          {"matrix": [6, 1], "x": 13.5, "y": 2},
-          {"matrix": [6, 0], "x": 14.5, "y": 2},
-
-          {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-
-          {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/meson/keyboard.json b/keyboards/meson/keyboard.json
new file mode 100644
index 00000000000..72d9ec58e72
--- /dev/null
+++ b/keyboards/meson/keyboard.json
@@ -0,0 +1,165 @@
+{
+    "keyboard_name": "Meson",
+    "manufacturer": "Luciano M",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x0000",
+      "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+      "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
+      "rows": ["F7", "C6", "F6", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+      "enabled": true,
+      "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+      "saturation_steps": 8,
+      "brightness_steps": 8,
+      "led_count": 10,
+      "sleep": true,
+      "split_count": [5, 5],
+      "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"
+    },
+    "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": [4, 6], "x": 8.5, "y": 0},
+          {"matrix": [4, 5], "x": 9.5, "y": 0},
+          {"matrix": [4, 4], "x": 10.5, "y": 0},
+          {"matrix": [4, 3], "x": 11.5, "y": 0},
+          {"matrix": [4, 2], "x": 12.5, "y": 0},
+          {"matrix": [4, 1], "x": 13.5, "y": 0},
+          {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+          {"matrix": [5, 5], "x": 9.5, "y": 1},
+          {"matrix": [5, 4], "x": 10.5, "y": 1},
+          {"matrix": [5, 3], "x": 11.5, "y": 1},
+          {"matrix": [5, 2], "x": 12.5, "y": 1},
+          {"matrix": [5, 1], "x": 13.5, "y": 1},
+          {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+          {"matrix": [6, 5], "x": 9.5, "y": 2},
+          {"matrix": [6, 4], "x": 10.5, "y": 2},
+          {"matrix": [6, 3], "x": 11.5, "y": 2},
+          {"matrix": [6, 2], "x": 12.5, "y": 2},
+          {"matrix": [6, 1], "x": 13.5, "y": 2},
+          {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [7, 5], "x": 9.5, "y": 3},
+          {"matrix": [7, 4], "x": 10.5, "y": 3}
+        ]
+      },
+      "LAYOUT_2u": {
+        "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": [4, 6], "x": 8.5, "y": 0},
+          {"matrix": [4, 5], "x": 9.5, "y": 0},
+          {"matrix": [4, 4], "x": 10.5, "y": 0},
+          {"matrix": [4, 3], "x": 11.5, "y": 0},
+          {"matrix": [4, 2], "x": 12.5, "y": 0},
+          {"matrix": [4, 1], "x": 13.5, "y": 0},
+          {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+          {"matrix": [5, 5], "x": 9.5, "y": 1},
+          {"matrix": [5, 4], "x": 10.5, "y": 1},
+          {"matrix": [5, 3], "x": 11.5, "y": 1},
+          {"matrix": [5, 2], "x": 12.5, "y": 1},
+          {"matrix": [5, 1], "x": 13.5, "y": 1},
+          {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+          {"matrix": [6, 5], "x": 9.5, "y": 2},
+          {"matrix": [6, 4], "x": 10.5, "y": 2},
+          {"matrix": [6, 3], "x": 11.5, "y": 2},
+          {"matrix": [6, 2], "x": 12.5, "y": 2},
+          {"matrix": [6, 1], "x": 13.5, "y": 2},
+          {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+          {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+          {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk
deleted file mode 100644
index 2f33b87f294..00000000000
--- a/keyboards/meson/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
-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/mexsistor/ludmila/matrix.c b/keyboards/mexsistor/ludmila/matrix.c
index 338286a7db6..5d27ec683fa 100644
--- a/keyboards/mexsistor/ludmila/matrix.c
+++ b/keyboards/mexsistor/ludmila/matrix.c
@@ -14,12 +14,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "util.h"
 #include "matrix.h"
-#include "quantum.h"
 
 // Encoder things
 #define ENC_SW F7
diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/blackio83.c
deleted file mode 100644
index 8c80ebd73c7..00000000000
--- a/keyboards/miiiw/blackio83/blackio83.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "blackio83.h"
-#include "usb_main.h"
-#include "usb_util.h"
-
-#define LOOP_10HZ_PERIOD    100
-deferred_token loop10hz_token  = INVALID_DEFERRED_TOKEN;
-uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg);
-
-static const SerialConfig mwproto_uart_config = {
-    .speed = MWPROTO_BITRATE,
-};
-
-static void POWER_EnterSleep(void) {
-    /* Clear Wake-up flag */
-    PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF;
-    /* Select Sleep mode */
-    /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */
-    /* Set SLEEPDEEP bit of Cortex System Control Register */
-    SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
-    /* Request Wait For Interrupt */
-    __WFI();
-    /* Reset SLEEPDEEP bit of Cortex System Control Register */
-    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
-    NVIC_SystemReset();
-}
-
-extern void ws2812_poweron(void);
-extern void ws2812_poweroff(void);
-
-static bool p_setup = false;
-static bool s_init = false;
-void ws2812_poweron(void) {
-    if(p_setup) return;
-    p_setup = true;
-    s_init = false;
-    setPinOutput(RGB_EN_PIN);
-    writePinHigh(RGB_EN_PIN);
-}
-
-void ws2812_poweroff(void) {
-    if(!p_setup) return;
-    p_setup = false;
-    setPinInputLow(WS2812_DI_PIN);
-    writePinLow(RGB_EN_PIN);
-}
-
-void keyboard_pre_init_kb() {
-	keyboard_pre_init_user();
-
-    setPinInputLow(MWPROTO_STATUS_PIN);
-    setPinOutput(MWPROTO_WAKEUP_PIN);
-    writePinLow(MWPROTO_WAKEUP_PIN);
-    wait_ms(2);
-    writePinHigh(MWPROTO_WAKEUP_PIN);
-
-	palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
-	sdStart(&MWPROTO_DRIVER, &mwproto_uart_config);
-}
-
-void keyboard_post_init_kb(void) {
-    keyboard_post_init_user();
-
-    print(/* clang-format off */
-        "\n<--QMK Keyboard-->\n"
-        "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n"
-        "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n"
-        "Version: " STR(DEVICE_VER) "\n"
-        "BUILD: " __DATE__ "\n"
-    ); /* clang-format on */
-
-    writePinLow(MWPROTO_WAKEUP_PIN);
-    wait_ms(50);
-    sdPutI(&MWPROTO_DRIVER, 0xA5);
-    sdPutI(&MWPROTO_DRIVER, 0x12);
-    sdPutI(&MWPROTO_DRIVER, 0x01);
-    sdPutI(&MWPROTO_DRIVER, 0x02);
-    sdPutI(&MWPROTO_DRIVER, 0xB4);
-    writePinHigh(MWPROTO_WAKEUP_PIN);
-
-    ws2812_poweron();
-    loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL);
-}
-
-bool shutdown_kb(bool jump_to_bootloader) {
-    if (shutdown_user(jump_to_bootloader)) {
-#ifdef RGB_MATRIX_ENABLE
-        rgb_matrix_set_suspend_state(true);
-#endif // RGB_MATRIX_ENABLE
-        wait_ms(10);
-    }
-    ws2812_poweroff();
-    return true;
-}
-
-#ifdef DIP_SWITCH_ENABLE
-bool dip_switch_update_mask_kb(uint32_t state) {
-    if (!dip_switch_update_mask_user(state)) { return false; }
-
-    if(state & 0x01) {
-        led_suspend();
-        usbDisconnectBus(&USB_DRIVER);
-        usbStop(&USB_DRIVER);
-        shutdown_user(true);
-        setPinInputHigh(POWER_SWITCH_PIN);
-        palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE);
-        POWER_EnterSleep();
-    }
-
-    return true;
-}
-#endif
-
-uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) {
-
-    if(last_input_activity_elapsed() > 1000) {
-        static uint32_t pmu_timer = 0;
-        if(timer_elapsed32(pmu_timer) > 3000) {
-            pmu_timer = timer_read32();
-            writePinLow(MWPROTO_WAKEUP_PIN);
-            if(readPin(MWPROTO_STATUS_PIN))
-                wait_us(500);
-            else
-                wait_us(1500);
-            sdPutI(&MWPROTO_DRIVER, 0xA5);
-            sdPutI(&MWPROTO_DRIVER, 0x28);
-            sdPutI(&MWPROTO_DRIVER, 0x00);
-            sdPutI(&MWPROTO_DRIVER, 0x8D);
-            writePinHigh(MWPROTO_WAKEUP_PIN);
-        }
-    }
-
-    extern matrix_row_t matrix[MATRIX_ROWS];
-    static uint32_t restore_tick = 0;
-    if(matrix[0] == 0x4000 && matrix[1] == 0 &&
-       matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) {
-        if(restore_tick++ > 50) {
-            restore_tick = 0;
-            writePinLow(MWPROTO_WAKEUP_PIN);
-            if(readPin(MWPROTO_STATUS_PIN))
-                wait_us(500);
-            else
-                wait_us(1500);
-            sdPutI(&MWPROTO_DRIVER, 0xA5);
-            sdPutI(&MWPROTO_DRIVER, 0x1F);
-            sdPutI(&MWPROTO_DRIVER, 0x01);
-            sdPutI(&MWPROTO_DRIVER, 0x0F);
-            sdPutI(&MWPROTO_DRIVER, 0xB4);
-            writePinHigh(MWPROTO_WAKEUP_PIN);
-            wait_ms(50);
-            eeconfig_init();
-    #ifdef RGB_MATRIX_ENABLE
-            extern void rgb_matrix_update_pwm_buffers(void);
-            for(int i = 0; i < 5; i++) {
-                rgb_matrix_set_color_all(RGB_WHITE);
-                rgb_matrix_update_pwm_buffers();
-                wait_ms(500);
-                rgb_matrix_set_color_all(RGB_OFF);
-                rgb_matrix_update_pwm_buffers();
-                wait_ms(500);
-            }
-    #endif
-            wait_ms(500);
-            soft_reset_keyboard();
-        }
-    } else {
-        restore_tick = 0;
-    }
-
-    static uint32_t debug_tick = 0;
-	if (debug_tick++ > 9 ) {
-        dprintf("trigger %d\n", trigger_time);
-		debug_tick = 0;
-	}
-
-    return LOOP_10HZ_PERIOD;
-}
diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h
deleted file mode 100644
index 055e8e35794..00000000000
--- a/keyboards/miiiw/blackio83/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// EEPROM i2c chip
-#define EEPROM_I2C_24LC256
diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json
deleted file mode 100644
index 24dc644405f..00000000000
--- a/keyboards/miiiw/blackio83/info.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
-    "manufacturer": "MIIIW",
-    "keyboard_name": "MIIIW BlackIO 83",
-    "maintainer": "ArthurCyy",
-    "bootloader": "stm32-dfu",
-    "debounce": 3,
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "deferred_exec": true,
-        "dip_switch": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "indicators": {
-        "caps_lock": "B2",
-        "num_lock": "B14"
-    },
-    "matrix_pins": {
-        "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"],
-        "rows": ["A7", "A6", "A5", "A4", "A3", "A2"]
-    },
-    "dip_switch": {
-        "pins": ["B0", "B1", "B8", "B12"]
-    },
-    "processor": "STM32F072",
-    "rgb_matrix": {
-        "animations": {
-            "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
-        },
-        "center_point": [62, 42],
-        "default": {
-            "animation": "solid_color"
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4},
-            {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4},
-            {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4},
-            {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4},
-            {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4},
-            {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4},
-            {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4},
-            {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4},
-            {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4},
-            {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4},
-            {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 124, "y": 20, "flags": 4},
-            {"matrix": [1, 1], "x": 108, "y": 20, "flags": 4},
-            {"matrix": [1, 2], "x": 96, "y": 20, "flags": 4},
-            {"matrix": [1, 3], "x": 88, "y": 20, "flags": 4},
-            {"matrix": [1, 4], "x": 80, "y": 20, "flags": 4},
-            {"matrix": [1, 5], "x": 72, "y": 20, "flags": 4},
-            {"matrix": [1, 6], "x": 64, "y": 20, "flags": 4},
-            {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4},
-            {"matrix": [1, 8], "x": 48, "y": 20, "flags": 4},
-            {"matrix": [1, 9], "x": 40, "y": 20, "flags": 4},
-            {"matrix": [1, 10], "x": 32, "y": 20, "flags": 4},
-            {"matrix": [1, 11], "x": 24, "y": 20, "flags": 4},
-            {"matrix": [1, 12], "x": 16, "y": 20, "flags": 4},
-            {"matrix": [1, 13], "x": 8, "y": 20, "flags": 4},
-            {"matrix": [1, 15], "x": 0, "y": 20, "flags": 4},
-            {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4},
-            {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4},
-            {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4},
-            {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4},
-            {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4},
-            {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4},
-            {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4},
-            {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4},
-            {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4},
-            {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4},
-            {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4},
-            {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4},
-            {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4},
-            {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4},
-            {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4},
-            {"matrix": [3, 0], "x": 124, "y": 52, "flags": 4},
-            {"matrix": [3, 1], "x": 107, "y": 52, "flags": 4},
-            {"matrix": [3, 2], "x": 94, "y": 52, "flags": 4},
-            {"matrix": [3, 3], "x": 86, "y": 52, "flags": 4},
-            {"matrix": [3, 4], "x": 78, "y": 52, "flags": 4},
-            {"matrix": [3, 5], "x": 70, "y": 52, "flags": 4},
-            {"matrix": [3, 6], "x": 62, "y": 52, "flags": 4},
-            {"matrix": [3, 7], "x": 54, "y": 52, "flags": 4},
-            {"matrix": [3, 8], "x": 46, "y": 52, "flags": 4},
-            {"matrix": [3, 9], "x": 38, "y": 52, "flags": 4},
-            {"matrix": [3, 10], "x": 30, "y": 52, "flags": 4},
-            {"matrix": [3, 11], "x": 22, "y": 52, "flags": 4},
-            {"matrix": [3, 12], "x": 14, "y": 52, "flags": 4},
-            {"matrix": [3, 15], "x": 3, "y": 52, "flags": 4},
-            {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4},
-            {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4},
-            {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4},
-            {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4},
-            {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4},
-            {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4},
-            {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4},
-            {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4},
-            {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4},
-            {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4},
-            {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4},
-            {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4},
-            {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4},
-            {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4},
-            {"matrix": [5, 0], "x": 122, "y": 84, "flags": 4},
-            {"matrix": [5, 1], "x": 114, "y": 84, "flags": 4},
-            {"matrix": [5, 2], "x": 106, "y": 84, "flags": 4},
-            {"matrix": [5, 5], "x": 96, "y": 84, "flags": 4},
-            {"matrix": [5, 8], "x": 88, "y": 84, "flags": 4},
-            {"matrix": [5, 9], "x": 80, "y": 84, "flags": 4},
-            {"matrix": [5, 10], "x": 50, "y": 84, "flags": 4},
-            {"matrix": [5, 12], "x": 20, "y": 88, "flags": 4},
-            {"matrix": [5, 13], "x": 10, "y": 88, "flags": 4},
-            {"matrix": [5, 14], "x": 1, "y": 88, "flags": 4}
-        ]
-    },
-    "url": "https://github.com/ArthurCyy",
-    "usb": {
-        "device_version": "0.0.1",
-        "pid": "0x83A1",
-        "vid": "0x3044"
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1.25, "y": 0},
-                {"matrix": [0, 3], "x": 2.25, "y": 0},
-                {"matrix": [0, 4], "x": 3.25, "y": 0},
-                {"matrix": [0, 5], "x": 4.25, "y": 0},
-                {"matrix": [0, 6], "x": 5.5, "y": 0},
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.75, "y": 0},
-                {"matrix": [0, 11], "x": 10.75, "y": 0},
-                {"matrix": [0, 12], "x": 11.75, "y": 0},
-                {"matrix": [0, 13], "x": 12.75, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [0, 15], "x": 15.25, "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, "w": 2},
-                {"matrix": [1, 15], "x": 15.25, "y": 1},
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 15], "x": 15.25, "y": 2},
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 15], "x": 15.25, "y": 3},
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4},
-                {"matrix": [4, 2], "x": 3.25, "y": 4},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [4, 4], "x": 5.25, "y": 4},
-                {"matrix": [4, 5], "x": 6.25, "y": 4},
-                {"matrix": [4, 6], "x": 7.25, "y": 4},
-                {"matrix": [4, 7], "x": 8.25, "y": 4},
-                {"matrix": [4, 8], "x": 9.25, "y": 4},
-                {"matrix": [4, 9], "x": 10.25, "y": 4},
-                {"matrix": [4, 10], "x": 11.25, "y": 4},
-                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 8], "x": 10, "y": 5},
-                {"matrix": [5, 9], "x": 11, "y": 5},
-                {"matrix": [5, 10], "x": 12, "y": 5},
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/matrix.c
deleted file mode 100644
index 841ff3c16e6..00000000000
--- a/keyboards/miiiw/blackio83/matrix.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-#include "matrix.h"
-#include "common/shift_register.h"
-
-static uint8_t read_rows(void);
-static void    init_cols(void);
-static void    select_col(uint8_t col);
-static void    unselect_col(uint8_t col);
-static void    unselect_cols(void);
-
-static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-#ifdef DIP_SWITCH_PINS
-#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
-static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
-#endif
-
-void matrix_init_custom(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        setPinInputLow(row_pins[row]);
-    }
-    
-    shift_init();
-    init_cols();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool changed = false;
-
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-        select_col(col);
-        waitInputPinDelay();
-        uint8_t rows = read_rows();
-        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-            bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0;
-            bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0;
-            if (prev_bit != curr_bit) {
-                current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col);
-                changed = true;
-            }
-        }
-        unselect_col(col);
-    }
-
-    return changed;
-}
-
-void matrix_power_up(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        palDisableLineEvent(row_pins[row]);
-        setPinInputLow(row_pins[row]);
-    }
-    init_cols();
-#ifdef DIP_SWITCH_PINS
-    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
-        setPinInputHigh(dip_switch_pad[i]);
-    }
-#endif
-}
-
-void matrix_power_down(void) {
-    unselect_cols();
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        setPinInputLow(row_pins[row]);
-        palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE);
-    }
-#ifdef DIP_SWITCH_PINS
-    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
-        setPinInputLow(dip_switch_pad[i]);
-    }
-#endif
-}
-
-static uint8_t read_rows(void) {
-    uint8_t row_value = 0;
-    for(uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        row_value |= (readPin(row_pins[row]) << row);
-    }
-    return row_value;
-}
-
-static void init_cols(void) {
-    shift_writeAll(0);
-    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
-        if(col_pins[col] < H0) {
-            setPinOutput(col_pins[col]);
-            writePinLow(col_pins[col]);
-        }
-    }
-}
-
-static void select_col(uint8_t col) {
-    if(col_pins[col] < H0){
-        writePinHigh(col_pins[col]);
-        waitInputPinDelay();
-        waitInputPinDelay();
-        waitInputPinDelay();
-        waitInputPinDelay();
-        waitInputPinDelay();
-        waitInputPinDelay();
-    }else{
-        shift_writePin(col_pins[col], 1);
-    }
-}
-
-static void unselect_col(uint8_t col) {
-    if(col_pins[col] < H0){
-        writePinLow(col_pins[col]);
-    }else{
-        shift_writePin(col_pins[col], 0);
-    }
-}
-
-static void unselect_cols(void) {
-    shift_writeAll(1);
-    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
-        if(col_pins[col] < H0) {
-            setPinOutput(col_pins[col]);
-            writePinHigh(col_pins[col]);
-        }
-    }
-}
diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h
index b1eec364edf..008d1448f2e 100644
--- a/keyboards/miiiw/blackio83/rev_0100/config.h
+++ b/keyboards/miiiw/blackio83/rev_0100/config.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
+// EEPROM i2c chip
+#define EEPROM_I2C_24LC256
+
 #define POWER_SWITCH_PIN B0
 
 /* 16 with dummy columns for shift registers */
diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/rev_0100/halconf.h
similarity index 100%
rename from keyboards/miiiw/blackio83/halconf.h
rename to keyboards/miiiw/blackio83/rev_0100/halconf.h
diff --git a/keyboards/miiiw/blackio83/rev_0100/keyboard.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.json
new file mode 100644
index 00000000000..d3fb31d109f
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/keyboard.json
@@ -0,0 +1,267 @@
+{
+    "manufacturer": "MIIIW",
+    "keyboard_name": "MIIIW BlackIO 83",
+    "maintainer": "ArthurCyy",
+    "bootloader": "stm32-dfu",
+    "debounce": 3,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "deferred_exec": true,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "B2",
+        "num_lock": "B14"
+    },
+    "matrix_pins": {
+        "cols": ["H0", "H1", "H2", "H3", "H4", "H5", "H6", "H7", "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"],
+        "rows": ["A7", "A6", "A5", "A4", "A3", "A2"]
+    },
+    "dip_switch": {
+        "pins": ["B0", "B1", "B8", "B12"]
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "animations": {
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "center_point": [62, 42],
+        "default": {
+            "animation": "solid_color"
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 10, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 18, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 26, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 52, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 60, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 68, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 78, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 86, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 102, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [1, 15], "x": 124, "y": 20, "flags": 4},
+            {"matrix": [1, 13], "x": 108, "y": 20, "flags": 4},
+            {"matrix": [1, 12], "x": 96, "y": 20, "flags": 4},
+            {"matrix": [1, 11], "x": 88, "y": 20, "flags": 4},
+            {"matrix": [1, 10], "x": 80, "y": 20, "flags": 4},
+            {"matrix": [1, 9], "x": 72, "y": 20, "flags": 4},
+            {"matrix": [1, 8], "x": 64, "y": 20, "flags": 4},
+            {"matrix": [1, 7], "x": 56, "y": 20, "flags": 4},
+            {"matrix": [1, 6], "x": 48, "y": 20, "flags": 4},
+            {"matrix": [1, 5], "x": 40, "y": 20, "flags": 4},
+            {"matrix": [1, 4], "x": 32, "y": 20, "flags": 4},
+            {"matrix": [1, 3], "x": 24, "y": 20, "flags": 4},
+            {"matrix": [1, 2], "x": 16, "y": 20, "flags": 4},
+            {"matrix": [1, 1], "x": 8, "y": 20, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 20, "flags": 4},
+            {"matrix": [2, 0], "x": 2, "y": 36, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 36, "flags": 4},
+            {"matrix": [2, 2], "x": 20, "y": 36, "flags": 4},
+            {"matrix": [2, 3], "x": 28, "y": 36, "flags": 4},
+            {"matrix": [2, 4], "x": 36, "y": 36, "flags": 4},
+            {"matrix": [2, 5], "x": 44, "y": 36, "flags": 4},
+            {"matrix": [2, 6], "x": 52, "y": 36, "flags": 4},
+            {"matrix": [2, 7], "x": 60, "y": 36, "flags": 4},
+            {"matrix": [2, 8], "x": 68, "y": 36, "flags": 4},
+            {"matrix": [2, 9], "x": 76, "y": 36, "flags": 4},
+            {"matrix": [2, 10], "x": 84, "y": 36, "flags": 4},
+            {"matrix": [2, 11], "x": 92, "y": 36, "flags": 4},
+            {"matrix": [2, 12], "x": 100, "y": 36, "flags": 4},
+            {"matrix": [2, 13], "x": 110, "y": 36, "flags": 4},
+            {"matrix": [2, 15], "x": 124, "y": 36, "flags": 4},
+            {"matrix": [3, 15], "x": 124, "y": 52, "flags": 4},
+            {"matrix": [3, 12], "x": 107, "y": 52, "flags": 4},
+            {"matrix": [3, 11], "x": 94, "y": 52, "flags": 4},
+            {"matrix": [3, 10], "x": 86, "y": 52, "flags": 4},
+            {"matrix": [3, 9], "x": 78, "y": 52, "flags": 4},
+            {"matrix": [3, 8], "x": 70, "y": 52, "flags": 4},
+            {"matrix": [3, 7], "x": 62, "y": 52, "flags": 4},
+            {"matrix": [3, 6], "x": 54, "y": 52, "flags": 4},
+            {"matrix": [3, 5], "x": 46, "y": 52, "flags": 4},
+            {"matrix": [3, 4], "x": 38, "y": 52, "flags": 4},
+            {"matrix": [3, 3], "x": 30, "y": 52, "flags": 4},
+            {"matrix": [3, 2], "x": 22, "y": 52, "flags": 4},
+            {"matrix": [3, 1], "x": 14, "y": 52, "flags": 4},
+            {"matrix": [3, 0], "x": 3, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 5, "y": 68, "flags": 4},
+            {"matrix": [4, 1], "x": 18, "y": 68, "flags": 4},
+            {"matrix": [4, 2], "x": 26, "y": 68, "flags": 4},
+            {"matrix": [4, 3], "x": 34, "y": 68, "flags": 4},
+            {"matrix": [4, 4], "x": 42, "y": 68, "flags": 4},
+            {"matrix": [4, 5], "x": 50, "y": 68, "flags": 4},
+            {"matrix": [4, 6], "x": 58, "y": 68, "flags": 4},
+            {"matrix": [4, 7], "x": 66, "y": 68, "flags": 4},
+            {"matrix": [4, 8], "x": 74, "y": 68, "flags": 4},
+            {"matrix": [4, 9], "x": 82, "y": 68, "flags": 4},
+            {"matrix": [4, 10], "x": 90, "y": 68, "flags": 4},
+            {"matrix": [4, 11], "x": 104, "y": 68, "flags": 4},
+            {"matrix": [4, 13], "x": 114, "y": 68, "flags": 4},
+            {"matrix": [4, 15], "x": 124, "y": 68, "flags": 4},
+            {"matrix": [5, 14], "x": 122, "y": 84, "flags": 4},
+            {"matrix": [5, 13], "x": 114, "y": 84, "flags": 4},
+            {"matrix": [5, 12], "x": 106, "y": 84, "flags": 4},
+            {"matrix": [5, 10], "x": 96, "y": 84, "flags": 4},
+            {"matrix": [5, 9], "x": 88, "y": 84, "flags": 4},
+            {"matrix": [5, 8], "x": 80, "y": 84, "flags": 4},
+            {"matrix": [5, 5], "x": 50, "y": 84, "flags": 4},
+            {"matrix": [5, 2], "x": 20, "y": 88, "flags": 4},
+            {"matrix": [5, 1], "x": 10, "y": 88, "flags": 4},
+            {"matrix": [5, 0], "x": 1, "y": 88, "flags": 4}
+        ],
+        "max_brightness": 160
+    },
+    "url": "https://github.com/ArthurCyy",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0x83A1",
+        "vid": "0x3044"
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "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, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5},
+                {"matrix": [5, 9], "x": 11, "y": 5},
+                {"matrix": [5, 10], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/miiiw/blackio83/rev_0100/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.c
new file mode 100644
index 00000000000..ab252f919b2
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/matrix.c
@@ -0,0 +1,139 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix.h"
+#include "wait.h"
+#include "common/shift_register.h"
+
+static uint8_t read_rows(void);
+static void    init_cols(void);
+static void    select_col(uint8_t col);
+static void    unselect_col(uint8_t col);
+static void    unselect_cols(void);
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+#ifdef DIP_SWITCH_PINS
+#    define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
+static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
+#endif
+
+void matrix_init_custom(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+    }
+    
+    shift_init();
+    init_cols();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+        select_col(col);
+        waitInputPinDelay();
+        uint8_t rows = read_rows();
+        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+            bool prev_bit = ((uint32_t)(current_matrix[row]) & (matrix_row_t)(1UL << col)) ? 1 : 0;
+            bool curr_bit = ((uint32_t)rows & (uint32_t)(1UL << row)) ? 1 : 0;
+            if (prev_bit != curr_bit) {
+                current_matrix[row] = (uint32_t)(current_matrix[row]) ^ (uint32_t)(1UL << col);
+                changed = true;
+            }
+        }
+        unselect_col(col);
+    }
+
+    return changed;
+}
+
+void matrix_power_up(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        palDisableLineEvent(row_pins[row]);
+        setPinInputLow(row_pins[row]);
+    }
+    init_cols();
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputHigh(dip_switch_pad[i]);
+    }
+#endif
+}
+
+void matrix_power_down(void) {
+    unselect_cols();
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        setPinInputLow(row_pins[row]);
+        palEnableLineEvent(row_pins[row], PAL_EVENT_MODE_RISING_EDGE);
+    }
+#ifdef DIP_SWITCH_PINS
+    for (uint8_t i = 1; i < NUMBER_OF_DIP_SWITCHES; i++) {
+        setPinInputLow(dip_switch_pad[i]);
+    }
+#endif
+}
+
+static uint8_t read_rows(void) {
+    uint8_t row_value = 0;
+    for(uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        row_value |= (readPin(row_pins[row]) << row);
+    }
+    return row_value;
+}
+
+static void init_cols(void) {
+    shift_writeAll(0);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinLow(col_pins[col]);
+        }
+    }
+}
+
+static void select_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinHigh(col_pins[col]);
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+        waitInputPinDelay();
+    }else{
+        shift_writePin(col_pins[col], 1);
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    if(col_pins[col] < H0){
+        writePinLow(col_pins[col]);
+    }else{
+        shift_writePin(col_pins[col], 0);
+    }
+}
+
+static void unselect_cols(void) {
+    shift_writeAll(1);
+    for(uint8_t col = 0; col < MATRIX_COLS; col++) {
+        if(col_pins[col] < H0) {
+            setPinOutput(col_pins[col]);
+            writePinHigh(col_pins[col]);
+        }
+    }
+}
diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/rev_0100/mcuconf.h
similarity index 100%
rename from keyboards/miiiw/blackio83/mcuconf.h
rename to keyboards/miiiw/blackio83/rev_0100/mcuconf.h
diff --git a/keyboards/miiiw/blackio83/rev_0100/rev_0100.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
new file mode 100644
index 00000000000..7af6861f535
--- /dev/null
+++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c
@@ -0,0 +1,192 @@
+/* Copyright 2023 ArthurCyy <https://github.com/ArthurCyy>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev_0100.h"
+#include "usb_main.h"
+#include "usb_util.h"
+
+#define LOOP_10HZ_PERIOD    100
+deferred_token loop10hz_token  = INVALID_DEFERRED_TOKEN;
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg);
+
+static const SerialConfig mwproto_uart_config = {
+    .speed = MWPROTO_BITRATE,
+};
+
+static void POWER_EnterSleep(void) {
+    /* Clear Wake-up flag */
+    PWR->CR |= PWR_CR_CWUF | PWR_CR_CSBF;
+    /* Select Sleep mode */
+    /* PWR->CR |= PWR_CR_PDDS | PWR_CR_LPDS; */
+    /* Set SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
+    /* Request Wait For Interrupt */
+    __WFI();
+    /* Reset SLEEPDEEP bit of Cortex System Control Register */
+    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
+    NVIC_SystemReset();
+}
+
+extern void ws2812_poweron(void);
+extern void ws2812_poweroff(void);
+
+static bool p_setup = false;
+static bool s_init = false;
+void ws2812_poweron(void) {
+    if(p_setup) return;
+    p_setup = true;
+    s_init = false;
+    setPinOutput(RGB_EN_PIN);
+    writePinHigh(RGB_EN_PIN);
+}
+
+void ws2812_poweroff(void) {
+    if(!p_setup) return;
+    p_setup = false;
+    setPinInputLow(WS2812_DI_PIN);
+    writePinLow(RGB_EN_PIN);
+}
+
+void keyboard_pre_init_kb() {
+	keyboard_pre_init_user();
+
+    setPinInputLow(MWPROTO_STATUS_PIN);
+    setPinOutput(MWPROTO_WAKEUP_PIN);
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(2);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+	palSetLineMode(MWPROTO_TX_PIN, PAL_MODE_ALTERNATE(MWPROTO_TX_PAL_MODE) | PAL_OUTPUT_TYPE_OPENDRAIN);
+	sdStart(&MWPROTO_DRIVER, &mwproto_uart_config);
+}
+
+void keyboard_post_init_kb(void) {
+    keyboard_post_init_user();
+
+    print(/* clang-format off */
+        "\n<--QMK Keyboard-->\n"
+        "Vendor: " STR(MANUFACTURER) "(" STR(VENDOR_ID) ")\n"
+        "Product: " STR(PRODUCT) " (" STR(PRODUCT_ID) ")\n"
+        "Version: " STR(DEVICE_VER) "\n"
+        "BUILD: " __DATE__ "\n"
+    ); /* clang-format on */
+
+    writePinLow(MWPROTO_WAKEUP_PIN);
+    wait_ms(50);
+    sdPutI(&MWPROTO_DRIVER, 0xA5);
+    sdPutI(&MWPROTO_DRIVER, 0x12);
+    sdPutI(&MWPROTO_DRIVER, 0x01);
+    sdPutI(&MWPROTO_DRIVER, 0x02);
+    sdPutI(&MWPROTO_DRIVER, 0xB4);
+    writePinHigh(MWPROTO_WAKEUP_PIN);
+
+    ws2812_poweron();
+    loop10hz_token = defer_exec(LOOP_10HZ_PERIOD, loop_10Hz, NULL);
+}
+
+bool shutdown_kb(bool jump_to_bootloader) {
+    if (shutdown_user(jump_to_bootloader)) {
+#ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_set_suspend_state(true);
+#endif // RGB_MATRIX_ENABLE
+        wait_ms(10);
+    }
+    ws2812_poweroff();
+    return true;
+}
+
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_mask_kb(uint32_t state) {
+    if (!dip_switch_update_mask_user(state)) { return false; }
+
+    if(state & 0x01) {
+        led_suspend();
+        usbDisconnectBus(&USB_DRIVER);
+        usbStop(&USB_DRIVER);
+        shutdown_user(true);
+        setPinInputHigh(POWER_SWITCH_PIN);
+        palEnableLineEvent(POWER_SWITCH_PIN, PAL_EVENT_MODE_RISING_EDGE);
+        POWER_EnterSleep();
+    }
+
+    return true;
+}
+#endif
+
+uint32_t loop_10Hz(uint32_t trigger_time, void *cb_arg) {
+
+    if(last_input_activity_elapsed() > 1000) {
+        static uint32_t pmu_timer = 0;
+        if(timer_elapsed32(pmu_timer) > 3000) {
+            pmu_timer = timer_read32();
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x28);
+            sdPutI(&MWPROTO_DRIVER, 0x00);
+            sdPutI(&MWPROTO_DRIVER, 0x8D);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+        }
+    }
+
+    extern matrix_row_t matrix[MATRIX_ROWS];
+    static uint32_t restore_tick = 0;
+    if(matrix[0] == 0x4000 && matrix[1] == 0 &&
+       matrix[2] == 0 && matrix[3] == 0 && matrix[4] == 0 && matrix[5] == 0x201) {
+        if(restore_tick++ > 50) {
+            restore_tick = 0;
+            writePinLow(MWPROTO_WAKEUP_PIN);
+            if(readPin(MWPROTO_STATUS_PIN))
+                wait_us(500);
+            else
+                wait_us(1500);
+            sdPutI(&MWPROTO_DRIVER, 0xA5);
+            sdPutI(&MWPROTO_DRIVER, 0x1F);
+            sdPutI(&MWPROTO_DRIVER, 0x01);
+            sdPutI(&MWPROTO_DRIVER, 0x0F);
+            sdPutI(&MWPROTO_DRIVER, 0xB4);
+            writePinHigh(MWPROTO_WAKEUP_PIN);
+            wait_ms(50);
+            eeconfig_init();
+    #ifdef RGB_MATRIX_ENABLE
+            extern void rgb_matrix_update_pwm_buffers(void);
+            for(int i = 0; i < 5; i++) {
+                rgb_matrix_set_color_all(RGB_WHITE);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+                rgb_matrix_set_color_all(RGB_OFF);
+                rgb_matrix_update_pwm_buffers();
+                wait_ms(500);
+            }
+    #endif
+            wait_ms(500);
+            soft_reset_keyboard();
+        }
+    } else {
+        restore_tick = 0;
+    }
+
+    static uint32_t debug_tick = 0;
+	if (debug_tick++ > 9 ) {
+        dprintf("trigger %d\n", trigger_time);
+		debug_tick = 0;
+	}
+
+    return LOOP_10HZ_PERIOD;
+}
diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/rev_0100/rev_0100.h
similarity index 100%
rename from keyboards/miiiw/blackio83/blackio83.h
rename to keyboards/miiiw/blackio83/rev_0100/rev_0100.h
diff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk
index 5558efa95d7..7a361addb34 100644
--- a/keyboards/miiiw/blackio83/rev_0100/rules.mk
+++ b/keyboards/miiiw/blackio83/rev_0100/rules.mk
@@ -1,7 +1,5 @@
 CUSTOM_MATRIX = lite
 
-WS2812_DRIVER_REQUIRED := yes
-
 # Project specific files
 SRC += matrix.c \
 	   common/shift_register.c
diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c
index 1f21c124683..2c9259180ea 100644
--- a/keyboards/miiiw/common/shift_register.c
+++ b/keyboards/miiiw/common/shift_register.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "shift_register.h"
+#include <string.h>
 
 static void shift_out(void);
 
diff --git a/keyboards/miiiw/common/shift_register.h b/keyboards/miiiw/common/shift_register.h
index f9895e63f82..8d72149be23 100644
--- a/keyboards/miiiw/common/shift_register.h
+++ b/keyboards/miiiw/common/shift_register.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include "gpio.h"
 
 #ifndef GPIOH_BASE
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
deleted file mode 100644
index 1249b0a5aba..00000000000
--- a/keyboards/miller/gm862/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "keyboard_name": "GM862",
-    "manufacturer": "MILLER",
-    "url": "",
-    "maintainer": "MILLER",
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x0223",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true
-        },
-        "driver": "is31fl3733",
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
-        "rows": ["F0", "F1", "F4", "F5", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/miller/gm862/keyboard.json b/keyboards/miller/gm862/keyboard.json
new file mode 100644
index 00000000000..b8c32cf16a6
--- /dev/null
+++ b/keyboards/miller/gm862/keyboard.json
@@ -0,0 +1,133 @@
+{
+    "keyboard_name": "GM862",
+    "manufacturer": "MILLER",
+    "url": "",
+    "maintainer": "MILLER",
+    "usb": {
+        "vid": "0x4B42",
+        "pid": "0x0223",
+        "device_version": "0.0.1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3733",
+        "sleep": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+        "rows": ["F0", "F1", "F4", "F5", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 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, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c
index 07b3acee9b9..2eb134f53da 100644
--- a/keyboards/miller/gm862/keymaps/default/keymap.c
+++ b/keyboards/miller/gm862/keymaps/default/keymap.c
@@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL ,
 			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
 		};
\ No newline at end of file
diff --git a/keyboards/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c
index 07b3acee9b9..2eb134f53da 100644
--- a/keyboards/miller/gm862/keymaps/via/keymap.c
+++ b/keyboards/miller/gm862/keymaps/via/keymap.c
@@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				QK_GESC,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL ,
 			    KC_TRNS,  RGB_TOG,  KC_UP,    RGB_MOD,  KC_TRNS,  KC_TRNS,  KC_CALC,  KC_TRNS,  KC_INS,   KC_TRNS,  KC_PSCR,  KC_SCRL,  KC_PAUS,  QK_BOOT  ,
 			    KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGUP,            KC_TRNS,
-				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  MAGIC_TOGGLE_NKRO,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
+				KC_MPRV,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_END,   KC_PGDN,  KC_MNXT,
 				KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
 		};
\ No newline at end of file
diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk
deleted file mode 100644
index 9f3770f0f40..00000000000
--- a/keyboards/miller/gm862/rules.mk
+++ /dev/null
@@ -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 = 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        # Use RGB matrix
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
deleted file mode 100644
index 4f2f658a205..00000000000
--- a/keyboards/mint60/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "keyboard_name": "Mint60",
-  "manufacturer": "Eucalyn",
-  "url": "",
-  "maintainer": "eucalyn",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x0000",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"],
-    "rows": ["C6", "D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "rgblight": {
-    "hue_steps": 10,
-    "led_count": 8,
-    "split": 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",
-  "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": [5, 0], "x": 7, "y": 0},
-        {"matrix": [5, 1], "x": 8, "y": 0},
-        {"matrix": [5, 2], "x": 9, "y": 0},
-        {"matrix": [5, 3], "x": 10, "y": 0},
-        {"matrix": [5, 4], "x": 11, "y": 0},
-        {"matrix": [5, 5], "x": 12, "y": 0},
-        {"matrix": [5, 6], "x": 13, "y": 0},
-        {"matrix": [5, 7], "x": 14, "y": 0, "w": 2},
-
-        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-        {"matrix": [6, 0], "x": 7.5, "y": 1},
-        {"matrix": [6, 1], "x": 8.5, "y": 1},
-        {"matrix": [6, 2], "x": 9.5, "y": 1},
-        {"matrix": [6, 3], "x": 10.5, "y": 1},
-        {"matrix": [6, 4], "x": 11.5, "y": 1},
-        {"matrix": [6, 5], "x": 12.5, "y": 1},
-        {"matrix": [6, 6], "x": 13.5, "y": 1},
-        {"matrix": [6, 7], "x": 14.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": [7, 0], "x": 7.75, "y": 2},
-        {"matrix": [7, 1], "x": 8.75, "y": 2},
-        {"matrix": [7, 2], "x": 9.75, "y": 2},
-        {"matrix": [7, 3], "x": 10.75, "y": 2},
-        {"matrix": [7, 4], "x": 11.75, "y": 2},
-        {"matrix": [7, 5], "x": 12.75, "y": 2},
-        {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-        {"matrix": [3, 1], "x": 2, "y": 3},
-        {"matrix": [3, 2], "x": 3, "y": 3},
-        {"matrix": [3, 3], "x": 4, "y": 3},
-        {"matrix": [3, 4], "x": 5, "y": 3},
-        {"matrix": [3, 5], "x": 6, "y": 3},
-
-        {"matrix": [8, 0], "x": 8, "y": 3},
-        {"matrix": [8, 1], "x": 9, "y": 3},
-        {"matrix": [8, 2], "x": 10, "y": 3},
-        {"matrix": [8, 3], "x": 11, "y": 3},
-        {"matrix": [8, 4], "x": 12, "y": 3},
-        {"matrix": [8, 5], "x": 13, "y": 3},
-        {"matrix": [8, 6], "x": 14, "y": 3},
-        {"matrix": [8, 7], "x": 15, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
-
-        {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75},
-        {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25},
-        {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
-        {"matrix": [9, 5], "x": 13, "y": 4},
-        {"matrix": [9, 6], "x": 14, "y": 4},
-        {"matrix": [9, 7], "x": 15, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/mint60/keyboard.json b/keyboards/mint60/keyboard.json
new file mode 100644
index 00000000000..332a366aa6e
--- /dev/null
+++ b/keyboards/mint60/keyboard.json
@@ -0,0 +1,132 @@
+{
+  "keyboard_name": "Mint60",
+  "manufacturer": "Eucalyn",
+  "url": "",
+  "maintainer": "eucalyn",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0000",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "rgblight": {
+    "hue_steps": 10,
+    "led_count": 8,
+    "split": 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",
+  "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": [5, 0], "x": 7, "y": 0},
+        {"matrix": [5, 1], "x": 8, "y": 0},
+        {"matrix": [5, 2], "x": 9, "y": 0},
+        {"matrix": [5, 3], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 5], "x": 12, "y": 0},
+        {"matrix": [5, 6], "x": 13, "y": 0},
+        {"matrix": [5, 7], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 0], "x": 7.5, "y": 1},
+        {"matrix": [6, 1], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [6, 4], "x": 11.5, "y": 1},
+        {"matrix": [6, 5], "x": 12.5, "y": 1},
+        {"matrix": [6, 6], "x": 13.5, "y": 1},
+        {"matrix": [6, 7], "x": 14.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": [7, 0], "x": 7.75, "y": 2},
+        {"matrix": [7, 1], "x": 8.75, "y": 2},
+        {"matrix": [7, 2], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
+        {"matrix": [7, 5], "x": 12.75, "y": 2},
+        {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [3, 2], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [3, 4], "x": 5, "y": 3},
+        {"matrix": [3, 5], "x": 6, "y": 3},
+
+        {"matrix": [8, 0], "x": 8, "y": 3},
+        {"matrix": [8, 1], "x": 9, "y": 3},
+        {"matrix": [8, 2], "x": 10, "y": 3},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3},
+        {"matrix": [8, 5], "x": 13, "y": 3},
+        {"matrix": [8, 6], "x": 14, "y": 3},
+        {"matrix": [8, 7], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+
+        {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 5], "x": 13, "y": 4},
+        {"matrix": [9, 6], "x": 14, "y": 4},
+        {"matrix": [9, 7], "x": 15, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk
deleted file mode 100644
index 2cd353930ea..00000000000
--- a/keyboards/mint60/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c
index e5389bb113d..f122b989570 100644
--- a/keyboards/mitosis/matrix.c
+++ b/keyboards/mitosis/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 8280ffa022b..83e66ce2ccf 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -45,6 +45,7 @@
         }
     },
     "split": {
+        "enabled": true,
         "bootmagic": {
             "matrix": [5, 0]
         },
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
index 497e86c8cb6..c38e4335e89 100644
--- a/keyboards/mlego/m60_split/rev1/rules.mk
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 ENCODER_ENABLE = yes        # Enable encoder
 
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 4ba64424434..e13ce195b42 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -38,6 +38,7 @@
         "pin": "B15"
     },
     "split": {
+        "enabled": true,
         "bootmagic": {
             "matrix": [5, 0]
         },
diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk
index ac47e053a2a..f3ecf1b52cb 100644
--- a/keyboards/mlego/m60_split/rev2/rules.mk
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 ENCODER_ENABLE = yes        # Enable encoder
diff --git a/keyboards/mntre_v3/mntre.c b/keyboards/mntre_v3/mntre_v3.c
similarity index 100%
rename from keyboards/mntre_v3/mntre.c
rename to keyboards/mntre_v3/mntre_v3.c
diff --git a/keyboards/molecule/adns.c b/keyboards/molecule/adns.c
index 96fc83ee0b5..0648193557e 100644
--- a/keyboards/molecule/adns.c
+++ b/keyboards/molecule/adns.c
@@ -16,7 +16,7 @@
 #include "spi_master.h"
 #include "adns.h"
 #include "debug.h"
-#include "quantum.h"
+#include "wait.h"
 #include "pointing_device.h"
 #include "adns9800_srom_A6.h"
 
diff --git a/keyboards/molecule/adns.h b/keyboards/molecule/adns.h
index d684d3cbcb1..e557aeb2ece 100644
--- a/keyboards/molecule/adns.h
+++ b/keyboards/molecule/adns.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include <stdint.h>
+
 void adns_begin(void);
 
 void adns_end(void);
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
deleted file mode 100644
index d45bb124b06..00000000000
--- a/keyboards/momoka_ergo/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "Momoka Ergo",
-    "manufacturer": "StefanGrindelwald",
-    "url": "",
-    "maintainer": "StefanGrindelwald",
-    "usb": {
-        "vid": "0x4F4D",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 22,
-        "split_count": [11, 11],
-        "animations": {
-            "breathing": true,
-            "rainbow_swirl": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 5], "x": 0, "y": 0.375, "w": 1.5},
-                {"matrix": [0, 4], "x": 1.5, "y": 0.375},
-                {"matrix": [0, 3], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 2], "x": 3.5, "y": 0},
-                {"matrix": [0, 1], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 0], "x": 5.5, "y": 0.25},
-
-                {"matrix": [7, 0], "x": 12.5, "y": 0.25},
-                {"matrix": [7, 1], "x": 13.5, "y": 0.125},
-                {"matrix": [7, 2], "x": 14.5, "y": 0},
-                {"matrix": [7, 3], "x": 15.5, "y": 0.125},
-                {"matrix": [7, 4], "x": 16.5, "y": 0.375},
-                {"matrix": [7, 5], "x": 17.5, "y": 0.375, "w": 1.5},
-
-                {"matrix": [1, 5], "x": 0, "y": 1.375, "w": 1.5},
-                {"matrix": [1, 4], "x": 1.5, "y": 1.375},
-                {"matrix": [1, 3], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 2], "x": 3.5, "y": 1},
-                {"matrix": [1, 1], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 0], "x": 5.5, "y": 1.25},
-
-                {"matrix": [8, 0], "x": 12.5, "y": 1.25},
-                {"matrix": [8, 1], "x": 13.5, "y": 1.125},
-                {"matrix": [8, 2], "x": 14.5, "y": 1},
-                {"matrix": [8, 3], "x": 15.5, "y": 1.125},
-                {"matrix": [8, 4], "x": 16.5, "y": 1.375},
-                {"matrix": [8, 5], "x": 17.5, "y": 1.375, "w": 1.5},
-
-                {"matrix": [2, 5], "x": 0, "y": 2.375, "w": 1.5},
-                {"matrix": [2, 4], "x": 1.5, "y": 2.375},
-                {"matrix": [2, 3], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 2], "x": 3.5, "y": 2},
-                {"matrix": [2, 1], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 0], "x": 5.5, "y": 2.25},
-
-                {"matrix": [9, 0], "x": 12.5, "y": 2.25},
-                {"matrix": [9, 1], "x": 13.5, "y": 2.125},
-                {"matrix": [9, 2], "x": 14.5, "y": 2},
-                {"matrix": [9, 3], "x": 15.5, "y": 2.125},
-                {"matrix": [9, 4], "x": 16.5, "y": 2.375},
-                {"matrix": [9, 5], "x": 17.5, "y": 2.375, "w": 1.5},
-
-                {"matrix": [3, 5], "x": 0, "y": 3.375, "w": 1.5},
-                {"matrix": [3, 4], "x": 1.5, "y": 3.375},
-                {"matrix": [3, 3], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 1], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 0], "x": 5.5, "y": 3.25},
-
-                {"matrix": [10, 0], "x": 12.5, "y": 3.25},
-                {"matrix": [10, 1], "x": 13.5, "y": 3.125},
-                {"matrix": [10, 2], "x": 14.5, "y": 3},
-                {"matrix": [10, 3], "x": 15.5, "y": 3.125},
-                {"matrix": [10, 4], "x": 16.5, "y": 3.375},
-                {"matrix": [10, 5], "x": 17.5, "y": 3.375, "w": 1.5},
-
-                {"matrix": [4, 5], "x": 0.5, "y": 4.375},
-                {"matrix": [4, 4], "x": 1.5, "y": 4.375},
-                {"matrix": [4, 3], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 2], "x": 3.5, "y": 4},
-                {"matrix": [4, 1], "x": 4.5, "y": 4.125},
-
-                {"matrix": [11, 1], "x": 13.5, "y": 4.125},
-                {"matrix": [11, 2], "x": 14.5, "y": 4},
-                {"matrix": [11, 3], "x": 15.5, "y": 4.125},
-                {"matrix": [11, 4], "x": 16.5, "y": 4.375},
-                {"matrix": [11, 5], "x": 17.5, "y": 4.375},
-
-                {"matrix": [5, 1], "x": 7, "y": 4.875},
-                {"matrix": [4, 0], "x": 8, "y": 4.875},
-
-                {"matrix": [11, 0], "x": 10, "y": 4.875},
-                {"matrix": [12, 1], "x": 11, "y": 4.875},
-
-                {"matrix": [5, 0], "x": 8, "y": 5.875},
-
-                {"matrix": [12, 0], "x": 10, "y": 5.875},
-
-                {"matrix": [5, 2], "x": 6, "y": 5.875, "h": 2},
-                {"matrix": [6, 1], "x": 7, "y": 5.875, "h": 2},
-                {"matrix": [6, 0], "x": 8, "y": 6.875},
-
-                {"matrix": [13, 0], "x": 10, "y": 6.875},
-                {"matrix": [13, 1], "x": 11, "y": 5.875, "h": 2},
-                {"matrix": [12, 2], "x": 12, "y": 5.875, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/momoka_ergo/keyboard.json b/keyboards/momoka_ergo/keyboard.json
new file mode 100644
index 00000000000..da21c509b92
--- /dev/null
+++ b/keyboards/momoka_ergo/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "Momoka Ergo",
+    "manufacturer": "StefanGrindelwald",
+    "url": "",
+    "maintainer": "StefanGrindelwald",
+    "usb": {
+        "vid": "0x4F4D",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 22,
+        "split_count": [11, 11],
+        "animations": {
+            "breathing": true,
+            "rainbow_swirl": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 5], "x": 0, "y": 0.375, "w": 1.5},
+                {"matrix": [0, 4], "x": 1.5, "y": 0.375},
+                {"matrix": [0, 3], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 1], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 0], "x": 5.5, "y": 0.25},
+
+                {"matrix": [7, 0], "x": 12.5, "y": 0.25},
+                {"matrix": [7, 1], "x": 13.5, "y": 0.125},
+                {"matrix": [7, 2], "x": 14.5, "y": 0},
+                {"matrix": [7, 3], "x": 15.5, "y": 0.125},
+                {"matrix": [7, 4], "x": 16.5, "y": 0.375},
+                {"matrix": [7, 5], "x": 17.5, "y": 0.375, "w": 1.5},
+
+                {"matrix": [1, 5], "x": 0, "y": 1.375, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 1.375},
+                {"matrix": [1, 3], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+                {"matrix": [1, 1], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 0], "x": 5.5, "y": 1.25},
+
+                {"matrix": [8, 0], "x": 12.5, "y": 1.25},
+                {"matrix": [8, 1], "x": 13.5, "y": 1.125},
+                {"matrix": [8, 2], "x": 14.5, "y": 1},
+                {"matrix": [8, 3], "x": 15.5, "y": 1.125},
+                {"matrix": [8, 4], "x": 16.5, "y": 1.375},
+                {"matrix": [8, 5], "x": 17.5, "y": 1.375, "w": 1.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.375, "w": 1.5},
+                {"matrix": [2, 4], "x": 1.5, "y": 2.375},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 1], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.25},
+
+                {"matrix": [9, 0], "x": 12.5, "y": 2.25},
+                {"matrix": [9, 1], "x": 13.5, "y": 2.125},
+                {"matrix": [9, 2], "x": 14.5, "y": 2},
+                {"matrix": [9, 3], "x": 15.5, "y": 2.125},
+                {"matrix": [9, 4], "x": 16.5, "y": 2.375},
+                {"matrix": [9, 5], "x": 17.5, "y": 2.375, "w": 1.5},
+
+                {"matrix": [3, 5], "x": 0, "y": 3.375, "w": 1.5},
+                {"matrix": [3, 4], "x": 1.5, "y": 3.375},
+                {"matrix": [3, 3], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 0], "x": 5.5, "y": 3.25},
+
+                {"matrix": [10, 0], "x": 12.5, "y": 3.25},
+                {"matrix": [10, 1], "x": 13.5, "y": 3.125},
+                {"matrix": [10, 2], "x": 14.5, "y": 3},
+                {"matrix": [10, 3], "x": 15.5, "y": 3.125},
+                {"matrix": [10, 4], "x": 16.5, "y": 3.375},
+                {"matrix": [10, 5], "x": 17.5, "y": 3.375, "w": 1.5},
+
+                {"matrix": [4, 5], "x": 0.5, "y": 4.375},
+                {"matrix": [4, 4], "x": 1.5, "y": 4.375},
+                {"matrix": [4, 3], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.125},
+
+                {"matrix": [11, 1], "x": 13.5, "y": 4.125},
+                {"matrix": [11, 2], "x": 14.5, "y": 4},
+                {"matrix": [11, 3], "x": 15.5, "y": 4.125},
+                {"matrix": [11, 4], "x": 16.5, "y": 4.375},
+                {"matrix": [11, 5], "x": 17.5, "y": 4.375},
+
+                {"matrix": [5, 1], "x": 7, "y": 4.875},
+                {"matrix": [4, 0], "x": 8, "y": 4.875},
+
+                {"matrix": [11, 0], "x": 10, "y": 4.875},
+                {"matrix": [12, 1], "x": 11, "y": 4.875},
+
+                {"matrix": [5, 0], "x": 8, "y": 5.875},
+
+                {"matrix": [12, 0], "x": 10, "y": 5.875},
+
+                {"matrix": [5, 2], "x": 6, "y": 5.875, "h": 2},
+                {"matrix": [6, 1], "x": 7, "y": 5.875, "h": 2},
+                {"matrix": [6, 0], "x": 8, "y": 6.875},
+
+                {"matrix": [13, 0], "x": 10, "y": 6.875},
+                {"matrix": [13, 1], "x": 11, "y": 5.875, "h": 2},
+                {"matrix": [12, 2], "x": 12, "y": 5.875, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk
deleted file mode 100644
index 850aa4e2248..00000000000
--- a/keyboards/momoka_ergo/rules.mk
+++ /dev/null
@@ -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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/monsgeek/m5/keymaps/default/keymap.c b/keyboards/monsgeek/m5/keymaps/default/keymap.c
index 28c433736cc..6fe98a89d6c 100644
--- a/keyboards/monsgeek/m5/keymaps/default/keymap.c
+++ b/keyboards/monsgeek/m5/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______,TG(WIN_WASD),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,                                     _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,          _______, _______, _______, _______,
-		_______, GUI_TOG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI,          _______, _______),
+		_______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI,          _______, _______),
 
     [MAC_B] = LAYOUT( /* Base */
 		KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
diff --git a/keyboards/monstargear/xo87/solderable/solderable.c b/keyboards/monstargear/xo87/solderable/solderable.c
index f1fc65ea011..cb4da24a3ac 100644
--- a/keyboards/monstargear/xo87/solderable/solderable.c
+++ b/keyboards/monstargear/xo87/solderable/solderable.c
@@ -15,7 +15,6 @@
  */
 
 #include "solderable.h"
-#include "quantum.h"
 
 #define noLed {255,255}
 
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 8c9b6214dba..1cb9590e9f9 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 #include "pca9555.h"
 
 /*
diff --git a/keyboards/mt/split75/matrix.c b/keyboards/mt/split75/matrix.c
index 196a543faaf..df5e9c056b5 100644
--- a/keyboards/mt/split75/matrix.c
+++ b/keyboards/mt/split75/matrix.c
@@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string.h>
-#include <stdio.h>
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_master.h"
 
 #define RIGHT_HALF
diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/rev1/keyboard.json
similarity index 100%
rename from keyboards/murcielago/info.json
rename to keyboards/murcielago/rev1/keyboard.json
diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/murcielago/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
deleted file mode 100644
index 0c92f469aea..00000000000
--- a/keyboards/nacly/sodium42/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "keyboard_name": "sodium42",
-    "manufacturer": "nacly",
-    "url": "https://nacly.net",
-    "maintainer": "nacly",
-    "usb": {
-        "vid": "0xBEEF",
-        "pid": "0xFED0",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "C6", "E6", "B5", "B2", "B3"],
-        "rows": ["F7", "D4", "D7", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.25},
-                {"matrix": [0, 4], "x": 4, "y": 1},
-
-                {"matrix": [4, 4], "x": 8.75, "y": 1},
-                {"matrix": [4, 3], "x": 9.75, "y": 0.5},
-                {"matrix": [4, 2], "x": 10.75, "y": 0},
-                {"matrix": [4, 1], "x": 11.75, "y": 0.5},
-                {"matrix": [4, 0], "x": 12.75, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 2},
-
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [5, 3], "x": 9.75, "y": 1.5},
-                {"matrix": [5, 2], "x": 10.75, "y": 1},
-                {"matrix": [5, 1], "x": 11.75, "y": 1.5},
-                {"matrix": [5, 0], "x": 12.75, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 4], "x": 4, "y": 3},
-
-                {"matrix": [6, 4], "x": 8.75, "y": 3},
-                {"matrix": [6, 3], "x": 9.75, "y": 2.5},
-                {"matrix": [6, 2], "x": 10.75, "y": 2},
-                {"matrix": [6, 1], "x": 11.75, "y": 2.5},
-                {"matrix": [6, 0], "x": 12.75, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75},
-                {"matrix": [3, 1], "x": 1, "y": 3.5},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3.25},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [3, 5], "x": 5, "y": 4.5},
-
-                {"matrix": [7, 5], "x": 7.75, "y": 4.5},
-                {"matrix": [7, 4], "x": 8.75, "y": 4},
-                {"matrix": [7, 3], "x": 9.75, "y": 3.5},
-                {"matrix": [7, 2], "x": 10.75, "y": 3},
-                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
-                {"matrix": [7, 0], "x": 12.75, "y": 3.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nacly/sodium42/keyboard.json b/keyboards/nacly/sodium42/keyboard.json
new file mode 100644
index 00000000000..f084ca2a239
--- /dev/null
+++ b/keyboards/nacly/sodium42/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "sodium42",
+    "manufacturer": "nacly",
+    "url": "https://nacly.net",
+    "maintainer": "nacly",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xFED0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3"],
+        "rows": ["F7", "D4", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+
+                {"matrix": [4, 4], "x": 8.75, "y": 1},
+                {"matrix": [4, 3], "x": 9.75, "y": 0.5},
+                {"matrix": [4, 2], "x": 10.75, "y": 0},
+                {"matrix": [4, 1], "x": 11.75, "y": 0.5},
+                {"matrix": [4, 0], "x": 12.75, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 3], "x": 9.75, "y": 1.5},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 1], "x": 11.75, "y": 1.5},
+                {"matrix": [5, 0], "x": 12.75, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 3},
+
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [6, 3], "x": 9.75, "y": 2.5},
+                {"matrix": [6, 2], "x": 10.75, "y": 2},
+                {"matrix": [6, 1], "x": 11.75, "y": 2.5},
+                {"matrix": [6, 0], "x": 12.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 5], "x": 5, "y": 4.5},
+
+                {"matrix": [7, 5], "x": 7.75, "y": 4.5},
+                {"matrix": [7, 4], "x": 8.75, "y": 4},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 10.75, "y": 3},
+                {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 0], "x": 12.75, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk
deleted file mode 100644
index f30bd81997e..00000000000
--- a/keyboards/nacly/sodium42/rules.mk
+++ /dev/null
@@ -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 = yes        # 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
-
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
deleted file mode 100644
index aa60255b0d3..00000000000
--- a/keyboards/nacly/sodium50/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "keyboard_name": "sodium50",
-    "manufacturer": "nacly",
-    "url": "https://nacly.net",
-    "maintainer": "nacly",
-    "usb": {
-        "vid": "0xBEEF",
-        "pid": "0xFED0",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
-        "rows": ["F7", "D4", "D7", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.5},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 1},
-
-                {"matrix": [4, 5], "x": 9.75, "y": 1},
-                {"matrix": [4, 4], "x": 10.75, "y": 0.5},
-                {"matrix": [4, 3], "x": 11.75, "y": 0},
-                {"matrix": [4, 2], "x": 12.75, "y": 0.5},
-                {"matrix": [4, 1], "x": 13.75, "y": 0.75},
-                {"matrix": [4, 0], "x": 14.75, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75},
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 2},
-
-                {"matrix": [5, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 4], "x": 10.75, "y": 1.5},
-                {"matrix": [5, 3], "x": 11.75, "y": 1},
-                {"matrix": [5, 2], "x": 12.75, "y": 1.5},
-                {"matrix": [5, 1], "x": 13.75, "y": 1.75},
-                {"matrix": [5, 0], "x": 14.75, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75},
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 3},
-
-                {"matrix": [6, 5], "x": 9.75, "y": 3},
-                {"matrix": [6, 4], "x": 10.75, "y": 2.5},
-                {"matrix": [6, 3], "x": 11.75, "y": 2},
-                {"matrix": [6, 2], "x": 12.75, "y": 2.5},
-                {"matrix": [6, 1], "x": 13.75, "y": 2.75},
-                {"matrix": [6, 0], "x": 14.75, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75},
-                {"matrix": [3, 1], "x": 1, "y": 3.75},
-                {"matrix": [3, 2], "x": 2, "y": 3.5},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.25},
-                {"matrix": [3, 5], "x": 5, "y": 4},
-                {"matrix": [3, 6], "x": 6, "y": 4.5},
-
-                {"matrix": [7, 6], "x": 8.75, "y": 4.5},
-                {"matrix": [7, 5], "x": 9.75, "y": 4},
-                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
-                {"matrix": [7, 3], "x": 11.75, "y": 3},
-                {"matrix": [7, 2], "x": 12.75, "y": 3.5},
-                {"matrix": [7, 1], "x": 13.75, "y": 3.75},
-                {"matrix": [7, 0], "x": 14.75, "y": 3.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nacly/sodium50/keyboard.json b/keyboards/nacly/sodium50/keyboard.json
new file mode 100644
index 00000000000..ff7b691d9d7
--- /dev/null
+++ b/keyboards/nacly/sodium50/keyboard.json
@@ -0,0 +1,93 @@
+{
+    "keyboard_name": "sodium50",
+    "manufacturer": "nacly",
+    "url": "https://nacly.net",
+    "maintainer": "nacly",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xFED0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+        "rows": ["F7", "D4", "D7", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+
+                {"matrix": [4, 5], "x": 9.75, "y": 1},
+                {"matrix": [4, 4], "x": 10.75, "y": 0.5},
+                {"matrix": [4, 3], "x": 11.75, "y": 0},
+                {"matrix": [4, 2], "x": 12.75, "y": 0.5},
+                {"matrix": [4, 1], "x": 13.75, "y": 0.75},
+                {"matrix": [4, 0], "x": 14.75, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+
+                {"matrix": [5, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 4], "x": 10.75, "y": 1.5},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 2], "x": 12.75, "y": 1.5},
+                {"matrix": [5, 1], "x": 13.75, "y": 1.75},
+                {"matrix": [5, 0], "x": 14.75, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 3},
+
+                {"matrix": [6, 5], "x": 9.75, "y": 3},
+                {"matrix": [6, 4], "x": 10.75, "y": 2.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 2},
+                {"matrix": [6, 2], "x": 12.75, "y": 2.5},
+                {"matrix": [6, 1], "x": 13.75, "y": 2.75},
+                {"matrix": [6, 0], "x": 14.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+                {"matrix": [3, 6], "x": 6, "y": 4.5},
+
+                {"matrix": [7, 6], "x": 8.75, "y": 4.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 4},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 3},
+                {"matrix": [7, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 13.75, "y": 3.75},
+                {"matrix": [7, 0], "x": 14.75, "y": 3.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk
deleted file mode 100644
index f30bd81997e..00000000000
--- a/keyboards/nacly/sodium50/rules.mk
+++ /dev/null
@@ -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 = yes        # 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
-
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
deleted file mode 100644
index de4f22d6074..00000000000
--- a/keyboards/nacly/sodium62/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "sodium62",
-    "manufacturer": "nacly",
-    "url": "https://nacly.net",
-    "maintainer": "nacly",
-    "usb": {
-        "vid": "0x6E61",
-        "pid": "0x636C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
-        "rows": ["F7", "D4", "D7", "B4", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.75},
-                {"matrix": [0, 1], "x": 1, "y": 0.75},
-                {"matrix": [0, 2], "x": 2, "y": 0.5},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 9.75, "y": 1},
-                {"matrix": [5, 4], "x": 10.75, "y": 0.5},
-                {"matrix": [5, 3], "x": 11.75, "y": 0},
-                {"matrix": [5, 2], "x": 12.75, "y": 0.5},
-                {"matrix": [5, 1], "x": 13.75, "y": 0.75},
-                {"matrix": [5, 0], "x": 14.75, "y": 0.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.75},
-                {"matrix": [1, 1], "x": 1, "y": 1.75},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 9.75, "y": 2},
-                {"matrix": [6, 4], "x": 10.75, "y": 1.5},
-                {"matrix": [6, 3], "x": 11.75, "y": 1},
-                {"matrix": [6, 2], "x": 12.75, "y": 1.5},
-                {"matrix": [6, 1], "x": 13.75, "y": 1.75},
-                {"matrix": [6, 0], "x": 14.75, "y": 1.75},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.75},
-                {"matrix": [2, 1], "x": 1, "y": 2.75},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 3},
-
-                {"matrix": [7, 5], "x": 9.75, "y": 3},
-                {"matrix": [7, 4], "x": 10.75, "y": 2.5},
-                {"matrix": [7, 3], "x": 11.75, "y": 2},
-                {"matrix": [7, 2], "x": 12.75, "y": 2.5},
-                {"matrix": [7, 1], "x": 13.75, "y": 2.75},
-                {"matrix": [7, 0], "x": 14.75, "y": 2.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.75},
-                {"matrix": [3, 1], "x": 1, "y": 3.75},
-                {"matrix": [3, 2], "x": 2, "y": 3.5},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.25},
-                {"matrix": [3, 5], "x": 5, "y": 4},
-
-                {"matrix": [8, 5], "x": 9.75, "y": 4},
-                {"matrix": [8, 4], "x": 10.75, "y": 3.5},
-                {"matrix": [8, 3], "x": 11.75, "y": 3},
-                {"matrix": [8, 2], "x": 12.75, "y": 3.5},
-                {"matrix": [8, 1], "x": 13.75, "y": 3.75},
-                {"matrix": [8, 0], "x": 14.75, "y": 3.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.75},
-                {"matrix": [4, 1], "x": 1, "y": 4.75},
-                {"matrix": [4, 2], "x": 2, "y": 4.5},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4.25},
-                {"matrix": [4, 5], "x": 5, "y": 5},
-                {"matrix": [4, 6], "x": 6, "y": 5.5},
-
-                {"matrix": [9, 6], "x": 8.75, "y": 5.5},
-                {"matrix": [9, 5], "x": 9.75, "y": 5},
-                {"matrix": [9, 4], "x": 10.75, "y": 4.5},
-                {"matrix": [9, 3], "x": 11.75, "y": 4},
-                {"matrix": [9, 2], "x": 12.75, "y": 4.5},
-                {"matrix": [9, 1], "x": 13.75, "y": 4.75},
-                {"matrix": [9, 0], "x": 14.75, "y": 4.75}
-            ]
-        }
-    }
-}
diff --git a/keyboards/nacly/sodium62/keyboard.json b/keyboards/nacly/sodium62/keyboard.json
new file mode 100644
index 00000000000..941bad2bd6c
--- /dev/null
+++ b/keyboards/nacly/sodium62/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "sodium62",
+    "manufacturer": "nacly",
+    "url": "https://nacly.net",
+    "maintainer": "nacly",
+    "usb": {
+        "vid": "0x6E61",
+        "pid": "0x636C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+        "rows": ["F7", "D4", "D7", "B4", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 9.75, "y": 1},
+                {"matrix": [5, 4], "x": 10.75, "y": 0.5},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0.5},
+                {"matrix": [5, 1], "x": 13.75, "y": 0.75},
+                {"matrix": [5, 0], "x": 14.75, "y": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 9.75, "y": 2},
+                {"matrix": [6, 4], "x": 10.75, "y": 1.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 2], "x": 12.75, "y": 1.5},
+                {"matrix": [6, 1], "x": 13.75, "y": 1.75},
+                {"matrix": [6, 0], "x": 14.75, "y": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 5], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 2.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 2},
+                {"matrix": [7, 2], "x": 12.75, "y": 2.5},
+                {"matrix": [7, 1], "x": 13.75, "y": 2.75},
+                {"matrix": [7, 0], "x": 14.75, "y": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.75},
+                {"matrix": [3, 1], "x": 1, "y": 3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+
+                {"matrix": [8, 5], "x": 9.75, "y": 4},
+                {"matrix": [8, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [8, 1], "x": 13.75, "y": 3.75},
+                {"matrix": [8, 0], "x": 14.75, "y": 3.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.75},
+                {"matrix": [4, 1], "x": 1, "y": 4.75},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.25},
+                {"matrix": [4, 5], "x": 5, "y": 5},
+                {"matrix": [4, 6], "x": 6, "y": 5.5},
+
+                {"matrix": [9, 6], "x": 8.75, "y": 5.5},
+                {"matrix": [9, 5], "x": 9.75, "y": 5},
+                {"matrix": [9, 4], "x": 10.75, "y": 4.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4},
+                {"matrix": [9, 2], "x": 12.75, "y": 4.5},
+                {"matrix": [9, 1], "x": 13.75, "y": 4.75},
+                {"matrix": [9, 0], "x": 14.75, "y": 4.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk
deleted file mode 100644
index c62dc408b51..00000000000
--- a/keyboards/nacly/sodium62/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes        # 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
-
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
deleted file mode 100644
index c4992778890..00000000000
--- a/keyboards/nacly/splitreus62/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "keyboard_name": "Splitreus62",
-    "manufacturer": "NaCly",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0xBEEF",
-      "pid": "0xFED0",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "B4", "B5", "B6", "B2", "B3"],
-        "rows": ["D3", "D2", "D1", "D4", "C6", "D7"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-      "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-      "led_count": 12,
-      "split_count": [6, 6]
-    },
-    "ws2812": {
-      "pin": "B1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-      "LAYOUT": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0.6},
-          {"matrix": [0, 1], "x": 1, "y": 0.6},
-          {"matrix": [0, 2], "x": 2, "y": 0.35},
-          {"matrix": [0, 3], "x": 3, "y": 0},
-          {"matrix": [0, 4], "x": 4, "y": 0.35},
-          {"matrix": [0, 5], "x": 5, "y": 0.7},
-
-          {"matrix": [6, 5], "x": 9, "y": 0.7},
-          {"matrix": [6, 4], "x": 10, "y": 0.35},
-          {"matrix": [6, 3], "x": 11, "y": 0},
-          {"matrix": [6, 2], "x": 12, "y": 0.35},
-          {"matrix": [6, 1], "x": 13, "y": 0.6},
-          {"matrix": [6, 0], "x": 14, "y": 0.6},
-
-          {"matrix": [1, 0], "x": 0, "y": 1.6},
-          {"matrix": [1, 1], "x": 1, "y": 1.6},
-          {"matrix": [1, 2], "x": 2, "y": 1.35},
-          {"matrix": [1, 3], "x": 3, "y": 1},
-          {"matrix": [1, 4], "x": 4, "y": 1.35},
-          {"matrix": [1, 5], "x": 5, "y": 1.7},
-
-          {"matrix": [7, 5], "x": 9, "y": 1.7},
-          {"matrix": [7, 4], "x": 10, "y": 1.35},
-          {"matrix": [7, 3], "x": 11, "y": 1},
-          {"matrix": [7, 2], "x": 12, "y": 1.35},
-          {"matrix": [7, 1], "x": 13, "y": 1.6},
-          {"matrix": [7, 0], "x": 14, "y": 1.6},
-
-          {"matrix": [2, 0], "x": 0, "y": 2.6},
-          {"matrix": [2, 1], "x": 1, "y": 2.6},
-          {"matrix": [2, 2], "x": 2, "y": 2.35},
-          {"matrix": [2, 3], "x": 3, "y": 2},
-          {"matrix": [2, 4], "x": 4, "y": 2.35},
-          {"matrix": [2, 5], "x": 5, "y": 2.7},
-
-          {"matrix": [8, 5], "x": 9, "y": 2.7},
-          {"matrix": [8, 4], "x": 10, "y": 2.35},
-          {"matrix": [8, 3], "x": 11, "y": 2},
-          {"matrix": [8, 2], "x": 12, "y": 2.35},
-          {"matrix": [8, 1], "x": 13, "y": 2.6},
-          {"matrix": [8, 0], "x": 14, "y": 2.6},
-
-          {"matrix": [3, 0], "x": 0, "y": 3.6},
-          {"matrix": [3, 1], "x": 1, "y": 3.6},
-          {"matrix": [3, 2], "x": 2, "y": 3.35},
-          {"matrix": [3, 3], "x": 3, "y": 3},
-          {"matrix": [3, 4], "x": 4, "y": 3.35},
-          {"matrix": [3, 5], "x": 5, "y": 3.7},
-
-          {"matrix": [9, 5], "x": 9, "y": 3.7},
-          {"matrix": [9, 4], "x": 10, "y": 3.35},
-          {"matrix": [9, 3], "x": 11, "y": 3},
-          {"matrix": [9, 2], "x": 12, "y": 3.35},
-          {"matrix": [9, 1], "x": 13, "y": 3.6},
-          {"matrix": [9, 0], "x": 14, "y": 3.6},
-
-          {"matrix": [4, 0], "x": 0, "y": 4.6},
-          {"matrix": [4, 1], "x": 1, "y": 4.6},
-          {"matrix": [4, 2], "x": 2, "y": 4.35},
-          {"matrix": [4, 3], "x": 3, "y": 4},
-          {"matrix": [4, 4], "x": 4, "y": 4.35},
-          {"matrix": [4, 5], "x": 5, "y": 4.7},
-          {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
-
-          {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
-          {"matrix": [10, 5], "x": 9, "y": 4.7},
-          {"matrix": [10, 4], "x": 10, "y": 4.35},
-          {"matrix": [10, 3], "x": 11, "y": 4},
-          {"matrix": [10, 2], "x": 12, "y": 4.35},
-          {"matrix": [10, 1], "x": 13, "y": 4.6},
-          {"matrix": [10, 0], "x": 14, "y": 4.6}
-        ]
-      }
-    }
-}
diff --git a/keyboards/nacly/splitreus62/keyboard.json b/keyboards/nacly/splitreus62/keyboard.json
new file mode 100644
index 00000000000..4efc32f5c5d
--- /dev/null
+++ b/keyboards/nacly/splitreus62/keyboard.json
@@ -0,0 +1,115 @@
+{
+    "keyboard_name": "Splitreus62",
+    "manufacturer": "NaCly",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0xBEEF",
+      "pid": "0xFED0",
+      "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "B4", "B5", "B6", "B2", "B3"],
+        "rows": ["D3", "D2", "D1", "D4", "C6", "D7"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+      "enabled": true,
+      "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+      "led_count": 12,
+      "split_count": [6, 6]
+    },
+    "ws2812": {
+      "pin": "B1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+      "LAYOUT": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0.6},
+          {"matrix": [0, 1], "x": 1, "y": 0.6},
+          {"matrix": [0, 2], "x": 2, "y": 0.35},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0.35},
+          {"matrix": [0, 5], "x": 5, "y": 0.7},
+
+          {"matrix": [6, 5], "x": 9, "y": 0.7},
+          {"matrix": [6, 4], "x": 10, "y": 0.35},
+          {"matrix": [6, 3], "x": 11, "y": 0},
+          {"matrix": [6, 2], "x": 12, "y": 0.35},
+          {"matrix": [6, 1], "x": 13, "y": 0.6},
+          {"matrix": [6, 0], "x": 14, "y": 0.6},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.6},
+          {"matrix": [1, 1], "x": 1, "y": 1.6},
+          {"matrix": [1, 2], "x": 2, "y": 1.35},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1.35},
+          {"matrix": [1, 5], "x": 5, "y": 1.7},
+
+          {"matrix": [7, 5], "x": 9, "y": 1.7},
+          {"matrix": [7, 4], "x": 10, "y": 1.35},
+          {"matrix": [7, 3], "x": 11, "y": 1},
+          {"matrix": [7, 2], "x": 12, "y": 1.35},
+          {"matrix": [7, 1], "x": 13, "y": 1.6},
+          {"matrix": [7, 0], "x": 14, "y": 1.6},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.6},
+          {"matrix": [2, 1], "x": 1, "y": 2.6},
+          {"matrix": [2, 2], "x": 2, "y": 2.35},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2.35},
+          {"matrix": [2, 5], "x": 5, "y": 2.7},
+
+          {"matrix": [8, 5], "x": 9, "y": 2.7},
+          {"matrix": [8, 4], "x": 10, "y": 2.35},
+          {"matrix": [8, 3], "x": 11, "y": 2},
+          {"matrix": [8, 2], "x": 12, "y": 2.35},
+          {"matrix": [8, 1], "x": 13, "y": 2.6},
+          {"matrix": [8, 0], "x": 14, "y": 2.6},
+
+          {"matrix": [3, 0], "x": 0, "y": 3.6},
+          {"matrix": [3, 1], "x": 1, "y": 3.6},
+          {"matrix": [3, 2], "x": 2, "y": 3.35},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3.35},
+          {"matrix": [3, 5], "x": 5, "y": 3.7},
+
+          {"matrix": [9, 5], "x": 9, "y": 3.7},
+          {"matrix": [9, 4], "x": 10, "y": 3.35},
+          {"matrix": [9, 3], "x": 11, "y": 3},
+          {"matrix": [9, 2], "x": 12, "y": 3.35},
+          {"matrix": [9, 1], "x": 13, "y": 3.6},
+          {"matrix": [9, 0], "x": 14, "y": 3.6},
+
+          {"matrix": [4, 0], "x": 0, "y": 4.6},
+          {"matrix": [4, 1], "x": 1, "y": 4.6},
+          {"matrix": [4, 2], "x": 2, "y": 4.35},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4.35},
+          {"matrix": [4, 5], "x": 5, "y": 4.7},
+          {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
+
+          {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
+          {"matrix": [10, 5], "x": 9, "y": 4.7},
+          {"matrix": [10, 4], "x": 10, "y": 4.35},
+          {"matrix": [10, 3], "x": 11, "y": 4},
+          {"matrix": [10, 2], "x": 12, "y": 4.35},
+          {"matrix": [10, 1], "x": 13, "y": 4.6},
+          {"matrix": [10, 0], "x": 14, "y": 4.6}
+        ]
+      }
+    }
+}
diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk
deleted file mode 100644
index 81ed47f82da..00000000000
--- a/keyboards/nacly/splitreus62/rules.mk
+++ /dev/null
@@ -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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index d71d9a6c4e8..5827e557b95 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 
 CIE1931_CURVE = yes
 
diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/info.json
new file mode 100755
index 00000000000..1a8f988b018
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/info.json
@@ -0,0 +1,946 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "keyboard_name": "Skelett 60",
+    "maintainer": "Yiancar-Designs",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
+        "rows": ["A2", "B9", "B8", "B5", "B4"]
+    },
+    "processor": "STM32F072",
+    "url": "https://yiancar-designs.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x7336",
+        "vid": "0x8968"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "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": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_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": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "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, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "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, 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": [1, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "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, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/skelett60/keymaps/default/keymap.c b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..6ce0d78bc7c
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          KC_RALT,  MO(1),    KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_all( /* FN */
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  _______,
+    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,  _______,
+    KC_VOLU,  KC_VOLD,  KC_MUTE,                                _______,                                _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/novelkeys/skelett60/keymaps/via/keymap.c b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6ce0d78bc7c
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    QK_GESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,    KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                       KC_SPC,                          KC_RALT,  MO(1),    KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_all( /* FN */
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  _______,
+    _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,  _______,
+    KC_VOLU,  KC_VOLD,  KC_MUTE,                                _______,                                _______,  _______,  _______,  _______)
+};
diff --git a/keyboards/novelkeys/skelett60/keymaps/via/rules.mk b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/novelkeys/skelett60/readme.md b/keyboards/novelkeys/skelett60/readme.md
new file mode 100755
index 00000000000..05c920502b3
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/readme.md
@@ -0,0 +1,36 @@
+# Skelett 60
+
+This is a standard 60% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 60% keyboard with STM32F072CB
+* Hardware Availability: https://novelkeys.com/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make novelkeys/skelett60:default
+
+Flashing example for this keyboard:
+
+    make novelkeys/skelett60:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make novelkeys/skelett60:<keymap>:flash`)
diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk
new file mode 100644
index 00000000000..6dd24d8e068
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/rules.mk
@@ -0,0 +1,3 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
diff --git a/keyboards/novelkeys/skelett60/skelett60.c b/keyboards/novelkeys/skelett60/skelett60.c
new file mode 100755
index 00000000000..fdbfa8f2727
--- /dev/null
+++ b/keyboards/novelkeys/skelett60/skelett60.c
@@ -0,0 +1,21 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "quantum.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN);
+}
diff --git a/keyboards/nullbitsco/common/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h
index 14cd4f15b7d..c649f1c1dd5 100644
--- a/keyboards/nullbitsco/common/bitc_led.h
+++ b/keyboards/nullbitsco/common/bitc_led.h
@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 #define LED_ON          2
 #define LED_DIM         1
diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c
index 8e3f7f6766d..bd2b396e6b5 100644
--- a/keyboards/nullbitsco/common/remote_kb.c
+++ b/keyboards/nullbitsco/common/remote_kb.c
@@ -27,7 +27,10 @@ This will require a new communication protocol, as the current one is limited.
 */
 
 #include "remote_kb.h"
+#include "quantum.h"
 #include "uart.h"
+#include "wait.h"
+#include "debug.h"
 
 uint8_t
  msg[UART_MSG_LEN],
diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h
index da124bf5f4e..97d299189df 100644
--- a/keyboards/nullbitsco/common/remote_kb.h
+++ b/keyboards/nullbitsco/common/remote_kb.h
@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "action.h"
 
 #define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz
 
diff --git a/keyboards/nullbitsco/nibble/big_led.h b/keyboards/nullbitsco/nibble/big_led.h
index 4ebcc35f08e..1198d3490bb 100644
--- a/keyboards/nullbitsco/nibble/big_led.h
+++ b/keyboards/nullbitsco/nibble/big_led.h
@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 /* Optional big LED pins */
 #define BIG_LED_R_PIN D7
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
index c734e80cefe..11a0e1f11eb 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
@@ -13,8 +13,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+
 #include "oled_display.h"
+#include "keycodes.h"
+#include "progmem.h"
+#include "host.h"
+#include "timer.h"
+#include "wpm.h"
+#include "rgblight.h"
+#include "oled_driver.h"
 
 static const char PROGMEM oled_mode_messages[5][15] = {
     "",
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
index bd59d44b413..7f2b5e1e779 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include <stdint.h>
+
 typedef enum {
     OLED_MODE_IDLE = 0,
     OLED_MODE_VOLUME_UP = 1,
diff --git a/keyboards/nullbitsco/nibble/matrix.c b/keyboards/nullbitsco/nibble/matrix.c
index 496c5dbe322..6508b704e9c 100644
--- a/keyboards/nullbitsco/nibble/matrix.c
+++ b/keyboards/nullbitsco/nibble/matrix.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "matrix.h"
+#include "wait.h"
 
 #define COL_SHIFTER ((uint32_t)1)
 
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index 65cd463708b..909e45d1625 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -31,6 +31,7 @@
         }
     },
     "split": {
+        "enabled": true,
         "encoder": {
             "right": {
                 "rotary": [
diff --git a/keyboards/nullbitsco/snap/matrix.c b/keyboards/nullbitsco/snap/matrix.c
index ceb9cd89841..3cd3f5c37e3 100644
--- a/keyboards/nullbitsco/snap/matrix.c
+++ b/keyboards/nullbitsco/snap/matrix.c
@@ -13,13 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "util.h"
 #include "matrix.h"
+#include <string.h>
 #include "split_util.h"
-#include "quantum.h"
+#include "wait.h"
 
 #define VIRT_COLS_PER_HAND 1
 #define PHYS_COLS_PER_HAND (MATRIX_COLS - VIRT_COLS_PER_HAND)
diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk
index 2ad88b97c02..087be867f3e 100644
--- a/keyboards/nullbitsco/snap/rules.mk
+++ b/keyboards/nullbitsco/snap/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no          # Audio output
-SPLIT_KEYBOARD = yes       # Split common
 LTO_ENABLE = yes           # Use Link Time Optimization
 ENCODER_ENABLE = yes       # Enables the use of one or more encoders
 SPACE_CADET_ENABLE = no    # Enables the use of Space Cadet
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
deleted file mode 100644
index 464cd01be8f..00000000000
--- a/keyboards/obosob/arch_36/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "Arch-36",
-    "manufacturer": "obosob",
-    "url": "",
-    "maintainer": "obosob",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x9CE3",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "led_count": 12,
-        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
-        "split_count": [6, 6]
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.375},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-
-                {"matrix": [4, 4], "x": 9, "y": 0.5},
-                {"matrix": [4, 3], "x": 10, "y": 0.375},
-                {"matrix": [4, 2], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0.25},
-                {"matrix": [4, 0], "x": 13, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.375},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-
-                {"matrix": [5, 4], "x": 9, "y": 1.5},
-                {"matrix": [5, 3], "x": 10, "y": 1.375},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 1], "x": 12, "y": 1.25},
-                {"matrix": [5, 0], "x": 13, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.375},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-
-                {"matrix": [6, 4], "x": 9, "y": 2.5},
-                {"matrix": [6, 3], "x": 10, "y": 2.375},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 1], "x": 12, "y": 2.25},
-                {"matrix": [6, 0], "x": 13, "y": 3},
-
-                {"matrix": [3, 2], "x": 3.5, "y": 3.5},
-                {"matrix": [3, 3], "x": 4.5, "y": 3.7},
-                {"matrix": [3, 4], "x": 5.5, "y": 4.1},
-
-                {"matrix": [7, 4], "x": 7.5, "y": 4.1},
-                {"matrix": [7, 3], "x": 8.5, "y": 3.7},
-                {"matrix": [7, 2], "x": 9.5, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/obosob/arch_36/keyboard.json b/keyboards/obosob/arch_36/keyboard.json
new file mode 100644
index 00000000000..db3e356f3a7
--- /dev/null
+++ b/keyboards/obosob/arch_36/keyboard.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "Arch-36",
+    "manufacturer": "obosob",
+    "url": "",
+    "maintainer": "obosob",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x9CE3",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "led_count": 12,
+        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
+        "split_count": [6, 6]
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.375},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+                {"matrix": [4, 4], "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "x": 10, "y": 0.375},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 1], "x": 12, "y": 0.25},
+                {"matrix": [4, 0], "x": 13, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.375},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [5, 4], "x": 9, "y": 1.5},
+                {"matrix": [5, 3], "x": 10, "y": 1.375},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 1], "x": 12, "y": 1.25},
+                {"matrix": [5, 0], "x": 13, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.375},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+                {"matrix": [6, 4], "x": 9, "y": 2.5},
+                {"matrix": [6, 3], "x": 10, "y": 2.375},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 1], "x": 12, "y": 2.25},
+                {"matrix": [6, 0], "x": 13, "y": 3},
+
+                {"matrix": [3, 2], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.7},
+                {"matrix": [3, 4], "x": 5.5, "y": 4.1},
+
+                {"matrix": [7, 4], "x": 7.5, "y": 4.1},
+                {"matrix": [7, 3], "x": 8.5, "y": 3.7},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
deleted file mode 100644
index 7d311cd4058..00000000000
--- a/keyboards/obosob/arch_36/rules.mk
+++ /dev/null
@@ -1,14 +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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes       # Split common
diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
deleted file mode 100644
index e598ec33929..00000000000
--- a/keyboards/obosob/steal_this_keyboard/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "keyboard_name": "Steal This Keyboard!",
-    "manufacturer": "Obosob",
-    "url": "https://github.com/obosob/steal_this_keyboard",
-    "maintainer": "@obosob",
-    "usb": {
-        "vid": "0xC2AB",
-        "pid": "0x50AD",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["F4", "F7", "B2", "D1", "D7"],
-            ["F5", "B1", "B6", "D0", "E6"],
-            ["F6", "B3", "D3", "D4", "B4"],
-            ["C6", "B5", null, null, null]
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "direct": [
-                    ["D7", "D1", "B2", "F7", "F4"],
-                    ["E6", "D0", "B6", "B1", "F5"],
-                    ["B4", "D4", "D3", "B3", "F6"],
-                    ["B5", "C6", null, null, null]
-                ]
-            }
-        }
-    },
-    "community_layouts": [
-        "split_3x5_2"
-    ],
-    "layouts": {
-        "LAYOUT_split_3x5_2": {
-            "layout": [
-                {"x": 0, "y": 0.93, "matrix": [0, 0]},
-                {"x": 1, "y": 0.31, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0.28, "matrix": [0, 3]},
-                {"x": 4, "y": 0.42, "matrix": [0, 4]},
-
-                {"x": 7, "y": 0.42, "matrix": [4, 0]},
-                {"x": 8, "y": 0.28, "matrix": [4, 1]},
-                {"x": 9, "y": 0, "matrix": [4, 2]},
-                {"x": 10, "y": 0.31, "matrix": [4, 3]},
-                {"x": 11, "y": 0.93, "matrix": [4, 4]},
-
-                {"x": 0, "y": 1.93, "matrix": [1, 0]},
-                {"x": 1, "y": 1.31, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1.28, "matrix": [1, 3]},
-                {"x": 4, "y": 1.42, "matrix": [1, 4]},
-
-                {"x": 7, "y": 1.42, "matrix": [5, 0]},
-                {"x": 8, "y": 1.28, "matrix": [5, 1]},
-                {"x": 9, "y": 1, "matrix": [5, 2]},
-                {"x": 10, "y": 1.31, "matrix": [5, 3]},
-                {"x": 11, "y": 1.93, "matrix": [5, 4]},
-
-                {"x": 0, "y": 2.93, "matrix": [2, 0]},
-                {"x": 1, "y": 2.31, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2.28, "matrix": [2, 3]},
-                {"x": 4, "y": 2.42, "matrix": [2, 4]},
-
-                {"x": 7, "y": 2.42, "matrix": [6, 0]},
-                {"x": 8, "y": 2.28, "matrix": [6, 1]},
-                {"x": 9, "y": 2, "matrix": [6, 2]},
-                {"x": 10, "y": 2.31, "matrix": [6, 3]},
-                {"x": 11, "y": 2.93, "matrix": [6, 4]},
-
-                {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
-                {"x": 4.5, "y": 4, "matrix": [3, 1]},
-
-                {"x": 6.5, "y": 4, "matrix": [7, 0]},
-                {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/obosob/steal_this_keyboard/keyboard.json b/keyboards/obosob/steal_this_keyboard/keyboard.json
new file mode 100644
index 00000000000..83de29d69c8
--- /dev/null
+++ b/keyboards/obosob/steal_this_keyboard/keyboard.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Steal This Keyboard!",
+    "manufacturer": "Obosob",
+    "url": "https://github.com/obosob/steal_this_keyboard",
+    "maintainer": "@obosob",
+    "usb": {
+        "vid": "0xC2AB",
+        "pid": "0x50AD",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "unicode": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F4", "F7", "B2", "D1", "D7"],
+            ["F5", "B1", "B6", "D0", "E6"],
+            ["F6", "B3", "D3", "D4", "B4"],
+            ["C6", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["D7", "D1", "B2", "F7", "F4"],
+                    ["E6", "D0", "B6", "B1", "F5"],
+                    ["B4", "D4", "D3", "B3", "F6"],
+                    ["B5", "C6", null, null, null]
+                ]
+            }
+        }
+    },
+    "community_layouts": [
+        "split_3x5_2"
+    ],
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x": 0, "y": 0.93, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+                {"x": 7, "y": 0.42, "matrix": [4, 0]},
+                {"x": 8, "y": 0.28, "matrix": [4, 1]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 3]},
+                {"x": 11, "y": 0.93, "matrix": [4, 4]},
+
+                {"x": 0, "y": 1.93, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+                {"x": 7, "y": 1.42, "matrix": [5, 0]},
+                {"x": 8, "y": 1.28, "matrix": [5, 1]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 3]},
+                {"x": 11, "y": 1.93, "matrix": [5, 4]},
+
+                {"x": 0, "y": 2.93, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+                {"x": 7, "y": 2.42, "matrix": [6, 0]},
+                {"x": 8, "y": 2.28, "matrix": [6, 1]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 3]},
+                {"x": 11, "y": 2.93, "matrix": [6, 4]},
+
+                {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
+                {"x": 4.5, "y": 4, "matrix": [3, 1]},
+
+                {"x": 6.5, "y": 4, "matrix": [7, 0]},
+                {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk
deleted file mode 100644
index 0ce5439c7b3..00000000000
--- a/keyboards/obosob/steal_this_keyboard/rules.mk
+++ /dev/null
@@ -1,14 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-UNICODE_ENABLE = yes        # Unicode
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Use shared split_common code
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 8e21be5d690..8ec0cb69b21 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -8,6 +8,9 @@
         "pid": "0xCA49",
         "device_version": "0.0.1"
     },
+    "split": {
+        "enabled": true
+    },
     "processor": "atmega32u4",
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
index 50c2891bb8a..5a3becd82a6 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
 POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns9800
 
diff --git a/keyboards/oddforge/vea/matrix.c b/keyboards/oddforge/vea/matrix.c
index 8b054ccbe04..36d4d3d353a 100644
--- a/keyboards/oddforge/vea/matrix.c
+++ b/keyboards/oddforge/vea/matrix.c
@@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string.h>
-#include <stdio.h>
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_master.h"
 
 #define RIGHT_HALF
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
deleted file mode 100644
index 6c3feea0e05..00000000000
--- a/keyboards/ogre/ergo_single/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "Ogre Ergo Single",
-    "manufacturer": "ctrlshiftba",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "rgblight": {
-        "led_count": 14,
-        "led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7],
-        "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": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [3, 6], "x": 0.25, "y": 0.5},
-                {"matrix": [0, 0], "x": 1.25, "y": 0.5},
-                {"matrix": [0, 1], "x": 2.25, "y": 0.5},
-                {"matrix": [0, 2], "x": 3.25, "y": 0.25},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0.25},
-                {"matrix": [0, 5], "x": 6.25, "y": 0.5},
-                {"matrix": [0, 6], "x": 7.25, "y": 0.5},
-
-                {"matrix": [5, 6], "x": 11.25, "y": 0.5},
-                {"matrix": [5, 5], "x": 12.25, "y": 0.5},
-                {"matrix": [5, 4], "x": 13.25, "y": 0.25},
-                {"matrix": [5, 3], "x": 14.25, "y": 0},
-                {"matrix": [5, 2], "x": 15.25, "y": 0.25},
-                {"matrix": [5, 1], "x": 16.25, "y": 0.5},
-                {"matrix": [5, 0], "x": 17.25, "y": 0.5},
-                {"matrix": [8, 6], "x": 18.25, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.5},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.5},
-
-                {"matrix": [6, 6], "x": 11.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 12.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 13.25, "y": 1.25},
-                {"matrix": [6, 3], "x": 14.25, "y": 1},
-                {"matrix": [6, 2], "x": 15.25, "y": 1.25},
-                {"matrix": [6, 1], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
-                {"matrix": [2, 1], "x": 2.25, "y": 2.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.25, "y": 2.5},
-                {"matrix": [2, 6], "x": 7.25, "y": 2.5},
-
-                {"matrix": [7, 6], "x": 11.25, "y": 2.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 2.5},
-                {"matrix": [7, 4], "x": 13.25, "y": 2.25},
-                {"matrix": [7, 3], "x": 14.25, "y": 2},
-                {"matrix": [7, 2], "x": 15.25, "y": 2.25},
-                {"matrix": [7, 1], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
-
-                {"matrix": [8, 5], "x": 12.25, "y": 3.5},
-                {"matrix": [8, 4], "x": 13.25, "y": 3.25},
-                {"matrix": [8, 3], "x": 14.25, "y": 3},
-                {"matrix": [8, 2], "x": 15.25, "y": 3.25},
-                {"matrix": [8, 1], "x": 16.25, "y": 3.5},
-                {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
-                {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
-
-                {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
-                {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
-                {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 2], "x": 15.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 16.25, "y": 4.5},
-                {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ogre/ergo_single/keyboard.json b/keyboards/ogre/ergo_single/keyboard.json
new file mode 100644
index 00000000000..3ebd88b0d28
--- /dev/null
+++ b/keyboards/ogre/ergo_single/keyboard.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Ogre Ergo Single",
+    "manufacturer": "ctrlshiftba",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "rgblight": {
+        "led_count": 14,
+        "led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7],
+        "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": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 6], "x": 0.25, "y": 0.5},
+                {"matrix": [0, 0], "x": 1.25, "y": 0.5},
+                {"matrix": [0, 1], "x": 2.25, "y": 0.5},
+                {"matrix": [0, 2], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0.5},
+                {"matrix": [0, 6], "x": 7.25, "y": 0.5},
+
+                {"matrix": [5, 6], "x": 11.25, "y": 0.5},
+                {"matrix": [5, 5], "x": 12.25, "y": 0.5},
+                {"matrix": [5, 4], "x": 13.25, "y": 0.25},
+                {"matrix": [5, 3], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0.25},
+                {"matrix": [5, 1], "x": 16.25, "y": 0.5},
+                {"matrix": [5, 0], "x": 17.25, "y": 0.5},
+                {"matrix": [8, 6], "x": 18.25, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 11.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 12.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 1], "x": 2.25, "y": 2.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 7.25, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 11.25, "y": 2.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 2.5},
+                {"matrix": [7, 4], "x": 13.25, "y": 2.25},
+                {"matrix": [7, 3], "x": 14.25, "y": 2},
+                {"matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 1], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+
+                {"matrix": [8, 5], "x": 12.25, "y": 3.5},
+                {"matrix": [8, 4], "x": 13.25, "y": 3.25},
+                {"matrix": [8, 3], "x": 14.25, "y": 3},
+                {"matrix": [8, 2], "x": 15.25, "y": 3.25},
+                {"matrix": [8, 1], "x": 16.25, "y": 3.5},
+                {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
+
+                {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
+                {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
+                {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 2], "x": 15.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 16.25, "y": 4.5},
+                {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk
deleted file mode 100644
index a3964a74c08..00000000000
--- a/keyboards/ogre/ergo_single/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = no
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
deleted file mode 100644
index 7da3bb487a6..00000000000
--- a/keyboards/ogre/ergo_split/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "keyboard_name": "Ogre Ergo Split",
-    "manufacturer": "ctrlshiftba",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D3"
-    },
-    "rgblight": {
-        "led_count": 14,
-        "led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
-        "split_count": [7, 7],
-        "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": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [3, 6], "x": 0.25, "y": 0.5},
-                {"matrix": [0, 0], "x": 1.25, "y": 0.5},
-                {"matrix": [0, 1], "x": 2.25, "y": 0.5},
-                {"matrix": [0, 2], "x": 3.25, "y": 0.25},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0.25},
-                {"matrix": [0, 5], "x": 6.25, "y": 0.5},
-                {"matrix": [0, 6], "x": 7.25, "y": 0.5},
-
-                {"matrix": [5, 6], "x": 11.25, "y": 0.5},
-                {"matrix": [5, 5], "x": 12.25, "y": 0.5},
-                {"matrix": [5, 4], "x": 13.25, "y": 0.25},
-                {"matrix": [5, 3], "x": 14.25, "y": 0},
-                {"matrix": [5, 2], "x": 15.25, "y": 0.25},
-                {"matrix": [5, 1], "x": 16.25, "y": 0.5},
-                {"matrix": [5, 0], "x": 17.25, "y": 0.5},
-                {"matrix": [8, 6], "x": 18.25, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
-                {"matrix": [1, 1], "x": 2.25, "y": 1.5},
-                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 4.25, "y": 1},
-                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 6.25, "y": 1.5},
-                {"matrix": [1, 6], "x": 7.25, "y": 1.5},
-
-                {"matrix": [6, 6], "x": 11.25, "y": 1.5},
-                {"matrix": [6, 5], "x": 12.25, "y": 1.5},
-                {"matrix": [6, 4], "x": 13.25, "y": 1.25},
-                {"matrix": [6, 3], "x": 14.25, "y": 1},
-                {"matrix": [6, 2], "x": 15.25, "y": 1.25},
-                {"matrix": [6, 1], "x": 16.25, "y": 1.5},
-                {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
-                {"matrix": [2, 1], "x": 2.25, "y": 2.5},
-                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
-                {"matrix": [2, 5], "x": 6.25, "y": 2.5},
-                {"matrix": [2, 6], "x": 7.25, "y": 2.5},
-
-                {"matrix": [7, 6], "x": 11.25, "y": 2.5},
-                {"matrix": [7, 5], "x": 12.25, "y": 2.5},
-                {"matrix": [7, 4], "x": 13.25, "y": 2.25},
-                {"matrix": [7, 3], "x": 14.25, "y": 2},
-                {"matrix": [7, 2], "x": 15.25, "y": 2.25},
-                {"matrix": [7, 1], "x": 16.25, "y": 2.5},
-                {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
-
-                {"matrix": [8, 5], "x": 12.25, "y": 3.5},
-                {"matrix": [8, 4], "x": 13.25, "y": 3.25},
-                {"matrix": [8, 3], "x": 14.25, "y": 3},
-                {"matrix": [8, 2], "x": 15.25, "y": 3.25},
-                {"matrix": [8, 1], "x": 16.25, "y": 3.5},
-                {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4},
-                {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
-                {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
-
-                {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
-                {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
-                {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
-                {"matrix": [9, 3], "x": 14.25, "y": 4},
-                {"matrix": [9, 2], "x": 15.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 16.25, "y": 4.5},
-                {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ogre/ergo_split/keyboard.json b/keyboards/ogre/ergo_split/keyboard.json
new file mode 100644
index 00000000000..765bebc2fba
--- /dev/null
+++ b/keyboards/ogre/ergo_split/keyboard.json
@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Ogre Ergo Split",
+    "manufacturer": "ctrlshiftba",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3"
+    },
+    "rgblight": {
+        "led_count": 14,
+        "led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
+        "split_count": [7, 7],
+        "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": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [3, 6], "x": 0.25, "y": 0.5},
+                {"matrix": [0, 0], "x": 1.25, "y": 0.5},
+                {"matrix": [0, 1], "x": 2.25, "y": 0.5},
+                {"matrix": [0, 2], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0.5},
+                {"matrix": [0, 6], "x": 7.25, "y": 0.5},
+
+                {"matrix": [5, 6], "x": 11.25, "y": 0.5},
+                {"matrix": [5, 5], "x": 12.25, "y": 0.5},
+                {"matrix": [5, 4], "x": 13.25, "y": 0.25},
+                {"matrix": [5, 3], "x": 14.25, "y": 0},
+                {"matrix": [5, 2], "x": 15.25, "y": 0.25},
+                {"matrix": [5, 1], "x": 16.25, "y": 0.5},
+                {"matrix": [5, 0], "x": 17.25, "y": 0.5},
+                {"matrix": [8, 6], "x": 18.25, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 11.25, "y": 1.5},
+                {"matrix": [6, 5], "x": 12.25, "y": 1.5},
+                {"matrix": [6, 4], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 14.25, "y": 1},
+                {"matrix": [6, 2], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 1], "x": 2.25, "y": 2.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 7.25, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 11.25, "y": 2.5},
+                {"matrix": [7, 5], "x": 12.25, "y": 2.5},
+                {"matrix": [7, 4], "x": 13.25, "y": 2.25},
+                {"matrix": [7, 3], "x": 14.25, "y": 2},
+                {"matrix": [7, 2], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 1], "x": 16.25, "y": 2.5},
+                {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+
+                {"matrix": [8, 5], "x": 12.25, "y": 3.5},
+                {"matrix": [8, 4], "x": 13.25, "y": 3.25},
+                {"matrix": [8, 3], "x": 14.25, "y": 3},
+                {"matrix": [8, 2], "x": 15.25, "y": 3.25},
+                {"matrix": [8, 1], "x": 16.25, "y": 3.5},
+                {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
+
+                {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
+                {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
+                {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 3], "x": 14.25, "y": 4},
+                {"matrix": [9, 2], "x": 15.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 16.25, "y": 4.5},
+                {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk
deleted file mode 100644
index ce485aeb0a5..00000000000
--- a/keyboards/ogre/ergo_split/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/om60/matrix.c b/keyboards/om60/matrix.c
index 36867804689..b0e252ec458 100644
--- a/keyboards/om60/matrix.c
+++ b/keyboards/om60/matrix.c
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "quantum.h"
+#include "matrix.h"
+#include "wait.h"
 
 #if (MATRIX_COLS <= 8)
 #    define ROW_SHIFTER ((uint8_t)1)
diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json
index 4369a041038..306a3970bb8 100644
--- a/keyboards/omkbd/ergodash/info.json
+++ b/keyboards/omkbd/ergodash/info.json
@@ -1,4 +1,7 @@
 {
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "split": {
+        "enabled": true
+    }
 }
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
index 739e22c04e6..f112f113945 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
@@ -9,8 +9,7 @@ enum layer_names {
 };
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -108,20 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 #endif
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-         print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
index 9a3cb950887..015ffcd8fb7 100644
--- a/keyboards/omkbd/ergodash/rules.mk
+++ b/keyboards/omkbd/ergodash/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes       # Enables split keyboard support
-
 DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json
index 4369a041038..306a3970bb8 100644
--- a/keyboards/omkbd/runner3680/info.json
+++ b/keyboards/omkbd/runner3680/info.json
@@ -1,4 +1,7 @@
 {
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "split": {
+        "enabled": true
+    }
 }
diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk
index 5f16740e242..d90dd4adda3 100644
--- a/keyboards/omkbd/runner3680/rules.mk
+++ b/keyboards/omkbd/runner3680/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes       # Enables split keyboard support
-
 DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/orthodox/info.json b/keyboards/orthodox/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/orthodox/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
index bb68468ec43..8fa7b0a404f 100644
--- a/keyboards/orthodox/rules.mk
+++ b/keyboards/orthodox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = orthodox/rev3
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c
index 38608e5a6c9..9e46da921d6 100644
--- a/keyboards/palette1202/lib/oled_helper.c
+++ b/keyboards/palette1202/lib/oled_helper.c
@@ -1,5 +1,5 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "oled_driver.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
index 2079750678a..c6a55a973af 100644
--- a/keyboards/phoenix/info.json
+++ b/keyboards/phoenix/info.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A9"
     },
     "processor": "STM32F401",
diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk
index a83da5e996d..1e98eb214a5 100644
--- a/keyboards/phoenix/rules.mk
+++ b/keyboards/phoenix/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 STENO_ENABLE = no
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 KEYBOARD_SHARED_EP = yes
 
diff --git a/keyboards/pierce/matrix.c b/keyboards/pierce/matrix.c
index 5023024b8b5..bcc88f7aa99 100644
--- a/keyboards/pierce/matrix.c
+++ b/keyboards/pierce/matrix.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_slave.h"
 
 #define MY_I2C_ADDRESS (0x20U << 1)
diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/pinky/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk
index 1b080863552..0329fc8dd57 100644
--- a/keyboards/pinky/rules.mk
+++ b/keyboards/pinky/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = pinky/3
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json
deleted file mode 100644
index e3dfef5ab7e..00000000000
--- a/keyboards/pisces/info.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "keyboard_name": "pisces",
-    "manufacturer": "knaruo",
-    "url": "https://github.com/knaruo/pisces",
-    "maintainer": "knaruo",
-    "usb": {
-        "vid": "0x6B6E",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
-        "rows": ["C4", "B0", "C7"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u2",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_split_3x6_1": {
-            "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": [3, 5], "x": 9, "y": 0},
-                {"matrix": [3, 4], "x": 10, "y": 0},
-                {"matrix": [3, 3], "x": 11, "y": 0},
-                {"matrix": [3, 2], "x": 12, "y": 0},
-                {"matrix": [3, 1], "x": 13, "y": 0},
-                {"matrix": [3, 0], "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": [4, 5], "x": 9, "y": 1},
-                {"matrix": [4, 4], "x": 10, "y": 1},
-                {"matrix": [4, 3], "x": 11, "y": 1},
-                {"matrix": [4, 2], "x": 12, "y": 1},
-                {"matrix": [4, 1], "x": 13, "y": 1},
-                {"matrix": [4, 0], "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": [5, 6], "x": 8, "y": 2},
-                {"matrix": [5, 5], "x": 9, "y": 2},
-                {"matrix": [5, 4], "x": 10, "y": 2},
-                {"matrix": [5, 3], "x": 11, "y": 2},
-                {"matrix": [5, 2], "x": 12, "y": 2},
-                {"matrix": [5, 1], "x": 13, "y": 2},
-                {"matrix": [5, 0], "x": 14, "y": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pisces/keyboard.json b/keyboards/pisces/keyboard.json
new file mode 100644
index 00000000000..2783f1085fd
--- /dev/null
+++ b/keyboards/pisces/keyboard.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "pisces",
+    "manufacturer": "knaruo",
+    "url": "https://github.com/knaruo/pisces",
+    "maintainer": "knaruo",
+    "usb": {
+        "vid": "0x6B6E",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+        "rows": ["C4", "B0", "C7"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_split_3x6_1": {
+            "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": [3, 5], "x": 9, "y": 0},
+                {"matrix": [3, 4], "x": 10, "y": 0},
+                {"matrix": [3, 3], "x": 11, "y": 0},
+                {"matrix": [3, 2], "x": 12, "y": 0},
+                {"matrix": [3, 1], "x": 13, "y": 0},
+                {"matrix": [3, 0], "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": [4, 5], "x": 9, "y": 1},
+                {"matrix": [4, 4], "x": 10, "y": 1},
+                {"matrix": [4, 3], "x": 11, "y": 1},
+                {"matrix": [4, 2], "x": 12, "y": 1},
+                {"matrix": [4, 1], "x": 13, "y": 1},
+                {"matrix": [4, 0], "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": [5, 6], "x": 8, "y": 2},
+                {"matrix": [5, 5], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 3], "x": 11, "y": 2},
+                {"matrix": [5, 2], "x": 12, "y": 2},
+                {"matrix": [5, 1], "x": 13, "y": 2},
+                {"matrix": [5, 0], "x": 14, "y": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk
deleted file mode 100644
index b3c916d3cea..00000000000
--- a/keyboards/pisces/rules.mk
+++ /dev/null
@@ -1,15 +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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c
index e31e473ae25..d1403567388 100644
--- a/keyboards/planck/rev6_drop/matrix.c
+++ b/keyboards/planck/rev6_drop/matrix.c
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "wait.h"
 
 /* matrix state(1:on, 0:off) */
 static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c
index 350ce93ce04..8cadfa5e8d5 100644
--- a/keyboards/planck/rev7/matrix.c
+++ b/keyboards/planck/rev7/matrix.c
@@ -15,11 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gpio.h"
-#include "hal_pal.h"
-#include "hal_pal_lld.h"
-#include "quantum.h"
+#include "matrix.h"
+#include <hal_pal.h>
 #include <math.h>
+#include "wait.h"
 
 // STM32-specific watchdog config calculations
 // timeout = 31.25us * PR * (RL + 1)
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
deleted file mode 100644
index 3668fc9a2b4..00000000000
--- a/keyboards/pluckey/info.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "keyboard_name": "pluckey",
-    "manufacturer": "floookay",
-    "url": "https://github.com/floookay/pluckey",
-    "maintainer": "floookay",
-    "usb": {
-        "vid": "0xF100",
-        "pid": "0x91CE",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"],
-        "rows": ["B4", "F5", "F6", "B6", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.625},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [5, 6], "x": 12, "y": 0.25},
-                {"matrix": [5, 5], "x": 13, "y": 0.25},
-                {"matrix": [5, 4], "x": 14, "y": 0.125},
-                {"matrix": [5, 3], "x": 15, "y": 0},
-                {"matrix": [5, 2], "x": 16, "y": 0.125},
-                {"matrix": [5, 1], "x": 17, "y": 0.625},
-                {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.625},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
-
-                {"matrix": [6, 6], "x": 12, "y": 1.25},
-                {"matrix": [6, 5], "x": 13, "y": 1.25},
-                {"matrix": [6, 4], "x": 14, "y": 1.125},
-                {"matrix": [6, 3], "x": 16, "y": 1.125},
-                {"matrix": [6, 2], "x": 15, "y": 1},
-                {"matrix": [6, 1], "x": 17, "y": 1.625},
-                {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.625},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"matrix": [7, 6], "x": 12, "y": 2.25},
-                {"matrix": [7, 5], "x": 13, "y": 2.25},
-                {"matrix": [7, 4], "x": 14, "y": 2.125},
-                {"matrix": [7, 3], "x": 16, "y": 2.125},
-                {"matrix": [7, 2], "x": 15, "y": 2},
-                {"matrix": [7, 1], "x": 17, "y": 2.625},
-                {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.625},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 3.25},
-                {"matrix": [4, 1], "x": 7.5, "y": 3.75},
-
-                {"matrix": [9, 1], "x": 11, "y": 3.75},
-                {"matrix": [8, 6], "x": 12, "y": 3.25},
-                {"matrix": [8, 5], "x": 13, "y": 3.25},
-                {"matrix": [8, 4], "x": 14, "y": 3.125},
-                {"matrix": [8, 3], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3.125},
-                {"matrix": [8, 1], "x": 17, "y": 3.625},
-                {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
-
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.75},
-
-                {"matrix": [9, 6], "x": 11.25, "y": 4.75},
-                {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
-                {"matrix": [9, 4], "x": 14, "y": 4.125},
-                {"matrix": [9, 3], "x": 15, "y": 4},
-                {"matrix": [9, 2], "x": 16, "y": 4.125}
-            ]
-        },
-        "LAYOUT_ergo": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
-                {"matrix": [0, 1], "x": 1.5, "y": 0.625},
-                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
-                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
-                {"matrix": [5, 6], "x": 12, "y": 0.25},
-                {"matrix": [5, 5], "x": 13, "y": 0.25},
-                {"matrix": [5, 4], "x": 14, "y": 0.125},
-                {"matrix": [5, 3], "x": 15, "y": 0},
-                {"matrix": [5, 2], "x": 16, "y": 0.125},
-                {"matrix": [5, 1], "x": 17, "y": 0.625},
-                {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.625},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
-                {"matrix": [6, 6], "x": 12, "y": 1.25, "h": 1.5},
-                {"matrix": [6, 5], "x": 13, "y": 1.25},
-                {"matrix": [6, 4], "x": 14, "y": 1.125},
-                {"matrix": [6, 3], "x": 16, "y": 1.125},
-                {"matrix": [6, 2], "x": 15, "y": 1},
-                {"matrix": [6, 1], "x": 17, "y": 1.625},
-                {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.625},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [7, 5], "x": 13, "y": 2.25},
-                {"matrix": [7, 4], "x": 14, "y": 2.125},
-                {"matrix": [7, 3], "x": 16, "y": 2.125},
-                {"matrix": [7, 2], "x": 15, "y": 2},
-                {"matrix": [7, 1], "x": 17, "y": 2.625},
-                {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3.625},
-                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
-                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
-                {"matrix": [4, 1], "x": 7.5, "y": 3.75},
-
-                {"matrix": [9, 1], "x": 11, "y": 3.75},
-                {"matrix": [8, 6], "x": 12, "y": 2.75, "h": 1.5},
-                {"matrix": [8, 5], "x": 13, "y": 3.25},
-                {"matrix": [8, 4], "x": 14, "y": 3.125},
-                {"matrix": [8, 3], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3.125},
-                {"matrix": [8, 1], "x": 17, "y": 3.625},
-                {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
-
-                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-                {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.75},
-
-                {"matrix": [9, 6], "x": 11.25, "y": 4.75},
-                {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
-                {"matrix": [9, 4], "x": 14, "y": 4.125},
-                {"matrix": [9, 3], "x": 15, "y": 4},
-                {"matrix": [9, 2], "x": 16, "y": 4.125}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pluckey/keyboard.json b/keyboards/pluckey/keyboard.json
new file mode 100644
index 00000000000..52e951e875c
--- /dev/null
+++ b/keyboards/pluckey/keyboard.json
@@ -0,0 +1,208 @@
+{
+    "keyboard_name": "pluckey",
+    "manufacturer": "floookay",
+    "url": "https://github.com/floookay/pluckey",
+    "maintainer": "floookay",
+    "usb": {
+        "vid": "0xF100",
+        "pid": "0x91CE",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"],
+        "rows": ["B4", "F5", "F6", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.625},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [5, 6], "x": 12, "y": 0.25},
+                {"matrix": [5, 5], "x": 13, "y": 0.25},
+                {"matrix": [5, 4], "x": 14, "y": 0.125},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 2], "x": 16, "y": 0.125},
+                {"matrix": [5, 1], "x": 17, "y": 0.625},
+                {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.625},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+
+                {"matrix": [6, 6], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.125},
+                {"matrix": [6, 3], "x": 16, "y": 1.125},
+                {"matrix": [6, 2], "x": 15, "y": 1},
+                {"matrix": [6, 1], "x": 17, "y": 1.625},
+                {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.625},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"matrix": [7, 6], "x": 12, "y": 2.25},
+                {"matrix": [7, 5], "x": 13, "y": 2.25},
+                {"matrix": [7, 4], "x": 14, "y": 2.125},
+                {"matrix": [7, 3], "x": 16, "y": 2.125},
+                {"matrix": [7, 2], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 17, "y": 2.625},
+                {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.625},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 3.25},
+                {"matrix": [4, 1], "x": 7.5, "y": 3.75},
+
+                {"matrix": [9, 1], "x": 11, "y": 3.75},
+                {"matrix": [8, 6], "x": 12, "y": 3.25},
+                {"matrix": [8, 5], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.125},
+                {"matrix": [8, 3], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3.125},
+                {"matrix": [8, 1], "x": 17, "y": 3.625},
+                {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.75},
+
+                {"matrix": [9, 6], "x": 11.25, "y": 4.75},
+                {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 14, "y": 4.125},
+                {"matrix": [9, 3], "x": 15, "y": 4},
+                {"matrix": [9, 2], "x": 16, "y": 4.125}
+            ]
+        },
+        "LAYOUT_ergo": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.625},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [5, 6], "x": 12, "y": 0.25},
+                {"matrix": [5, 5], "x": 13, "y": 0.25},
+                {"matrix": [5, 4], "x": 14, "y": 0.125},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 2], "x": 16, "y": 0.125},
+                {"matrix": [5, 1], "x": 17, "y": 0.625},
+                {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.625},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+                {"matrix": [6, 6], "x": 12, "y": 1.25, "h": 1.5},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.125},
+                {"matrix": [6, 3], "x": 16, "y": 1.125},
+                {"matrix": [6, 2], "x": 15, "y": 1},
+                {"matrix": [6, 1], "x": 17, "y": 1.625},
+                {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.625},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 13, "y": 2.25},
+                {"matrix": [7, 4], "x": 14, "y": 2.125},
+                {"matrix": [7, 3], "x": 16, "y": 2.125},
+                {"matrix": [7, 2], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 17, "y": 2.625},
+                {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.625},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+                {"matrix": [4, 1], "x": 7.5, "y": 3.75},
+
+                {"matrix": [9, 1], "x": 11, "y": 3.75},
+                {"matrix": [8, 6], "x": 12, "y": 2.75, "h": 1.5},
+                {"matrix": [8, 5], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.125},
+                {"matrix": [8, 3], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3.125},
+                {"matrix": [8, 1], "x": 17, "y": 3.625},
+                {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.75},
+
+                {"matrix": [9, 6], "x": 11.25, "y": 4.75},
+                {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 14, "y": 4.125},
+                {"matrix": [9, 3], "x": 15, "y": 4},
+                {"matrix": [9, 2], "x": 16, "y": 4.125}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
deleted file mode 100644
index 171b6139c2c..00000000000
--- a/keyboards/pluckey/rules.mk
+++ /dev/null
@@ -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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json
deleted file mode 100644
index ea6c5aafa89..00000000000
--- a/keyboards/polilla/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "Polilla",
-    "manufacturer": "elagil",
-    "url": "",
-    "maintainer": "elagil",
-    "usb": {
-        "vid": "0x6166",
-        "pid": "0x0010",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": false,
-        "nkro": false
-    },
-    "matrix_pins": {
-        "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"],
-        "rows": ["B1", "B0", "A7", "F1", "A0"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "STM32F042",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"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": 9.5, "y": 0},
-                {"matrix": [0, 7], "x": 10.5, "y": 0},
-                {"matrix": [0, 8], "x": 11.5, "y": 0},
-                {"matrix": [0, 9], "x": 12.5, "y": 0.125},
-                {"matrix": [0, 10], "x": 13.5, "y": 0.25},
-                {"matrix": [0, 11], "x": 14.5, "y": 0.25},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"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": 9.5, "y": 1},
-                {"matrix": [1, 7], "x": 10.5, "y": 1},
-                {"matrix": [1, 8], "x": 11.5, "y": 1},
-                {"matrix": [1, 9], "x": 12.5, "y": 1.125},
-                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 14.5, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"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": 9.5, "y": 2},
-                {"matrix": [2, 7], "x": 10.5, "y": 2},
-                {"matrix": [2, 8], "x": 11.5, "y": 2},
-                {"matrix": [2, 9], "x": 12.5, "y": 2.125},
-                {"matrix": [2, 10], "x": 13.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 14.5, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "x": 1, "y": 3.25},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [4, 5], "x": 9.5, "y": 3},
-                {"matrix": [4, 6], "x": 10.5, "y": 3},
-                {"matrix": [3, 6], "x": 11.5, "y": 3},
-                {"matrix": [3, 7], "x": 12.5, "y": 3.125},
-                {"matrix": [3, 8], "x": 13.5, "y": 3.25},
-                {"matrix": [3, 9], "x": 14.5, "y": 3.25},
-
-                {"matrix": [3, 10], "x": 2, "y": 4.125},
-                {"matrix": [3, 11], "x": 3, "y": 4},
-                {"matrix": [4, 0], "x": 4, "y": 4},
-                {"matrix": [4, 1], "x": 5, "y": 4},
-                {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5},
-                {"matrix": [4, 3], "x": 6, "y": 2.75},
-
-                {"matrix": [4, 4], "x": 8.5, "y": 2.75},
-                {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5},
-                {"matrix": [4, 8], "x": 9.5, "y": 4},
-                {"matrix": [4, 9], "x": 10.5, "y": 4},
-                {"matrix": [4, 10], "x": 11.5, "y": 4},
-                {"matrix": [4, 11], "x": 12.5, "y": 4.125}
-            ]
-        }
-    }
-}
diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/rev1/chconf.h
similarity index 100%
rename from keyboards/polilla/chconf.h
rename to keyboards/polilla/rev1/chconf.h
diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h
index 3b3b9b0fb79..c2b8d7aff92 100644
--- a/keyboards/polilla/rev1/config.h
+++ b/keyboards/polilla/rev1/config.h
@@ -16,26 +16,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/polilla/halconf.h b/keyboards/polilla/rev1/halconf.h
similarity index 100%
rename from keyboards/polilla/halconf.h
rename to keyboards/polilla/rev1/halconf.h
diff --git a/keyboards/polilla/rev1/keyboard.json b/keyboards/polilla/rev1/keyboard.json
new file mode 100644
index 00000000000..746f47963e2
--- /dev/null
+++ b/keyboards/polilla/rev1/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Polilla",
+    "manufacturer": "elagil",
+    "url": "",
+    "maintainer": "elagil",
+    "usb": {
+        "vid": "0x6166",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["A6", "A5", "A4", "A3", "A2", "A1", "F0", "B7", "B6", "B5", "B4", "B3"],
+        "rows": ["B1", "B0", "A7", "F1", "A0"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "STM32F042",
+    "bootloader": "stm32-dfu",
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"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": 9.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0.125},
+                {"matrix": [0, 10], "x": 13.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 14.5, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"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": 9.5, "y": 1},
+                {"matrix": [1, 7], "x": 10.5, "y": 1},
+                {"matrix": [1, 8], "x": 11.5, "y": 1},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.125},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"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": 9.5, "y": 2},
+                {"matrix": [2, 7], "x": 10.5, "y": 2},
+                {"matrix": [2, 8], "x": 11.5, "y": 2},
+                {"matrix": [2, 9], "x": 12.5, "y": 2.125},
+                {"matrix": [2, 10], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 14.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [4, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 6], "x": 10.5, "y": 3},
+                {"matrix": [3, 6], "x": 11.5, "y": 3},
+                {"matrix": [3, 7], "x": 12.5, "y": 3.125},
+                {"matrix": [3, 8], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 14.5, "y": 3.25},
+
+                {"matrix": [3, 10], "x": 2, "y": 4.125},
+                {"matrix": [3, 11], "x": 3, "y": 4},
+                {"matrix": [4, 0], "x": 4, "y": 4},
+                {"matrix": [4, 1], "x": 5, "y": 4},
+                {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5},
+                {"matrix": [4, 3], "x": 6, "y": 2.75},
+
+                {"matrix": [4, 4], "x": 8.5, "y": 2.75},
+                {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5},
+                {"matrix": [4, 8], "x": 9.5, "y": 4},
+                {"matrix": [4, 9], "x": 10.5, "y": 4},
+                {"matrix": [4, 10], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.125}
+            ]
+        }
+    }
+}
diff --git a/keyboards/polilla/mcuconf.h b/keyboards/polilla/rev1/mcuconf.h
similarity index 100%
rename from keyboards/polilla/mcuconf.h
rename to keyboards/polilla/rev1/mcuconf.h
diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/polilla/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c
index 60718caaba8..1d9ab5e8118 100644
--- a/keyboards/preonic/rev3_drop/matrix.c
+++ b/keyboards/preonic/rev3_drop/matrix.c
@@ -15,7 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "matrix.h"
+#include "debug.h"
+#include "timer.h"
+#include "wait.h"
 
 #ifndef DEBOUNCE
 #    define DEBOUNCE 5
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
deleted file mode 100644
index 76b6e596471..00000000000
--- a/keyboards/pteron36/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "Pteron36",
-    "manufacturer": "Harshit Goel",
-    "url": "",
-    "maintainer": "harshitgoel96",
-    "usb": {
-        "vid": "0x4847",
-        "pid": "0x5054",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2"],
-        "rows": ["E6", "D7", "B4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "dynamic_keymap": {
-        "layer_count": 7
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4"}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D3",
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5"}
-                ]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 10
-    },
-    "ws2812": {
-        "pin": "B6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
-    "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.5},
-                {"matrix": [0, 4], "x": 4, "y": 0.75},
-
-                {"matrix": [4, 4], "x": 10, "y": 0.75},
-                {"matrix": [4, 3], "x": 11, "y": 0.5},
-                {"matrix": [4, 2], "x": 12, "y": 0},
-                {"matrix": [4, 1], "x": 13, "y": 0.5},
-                {"matrix": [4, 0], "x": 14, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.75},
-
-                {"matrix": [5, 4], "x": 10, "y": 1.75},
-                {"matrix": [5, 3], "x": 11, "y": 1.5},
-                {"matrix": [5, 2], "x": 12, "y": 1},
-                {"matrix": [5, 1], "x": 13, "y": 1.5},
-                {"matrix": [5, 0], "x": 14, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.5},
-                {"matrix": [2, 4], "x": 4, "y": 2.75},
-
-                {"matrix": [6, 4], "x": 10, "y": 2.75},
-                {"matrix": [6, 3], "x": 11, "y": 2.5},
-                {"matrix": [6, 2], "x": 12, "y": 2},
-                {"matrix": [6, 1], "x": 13, "y": 2.5},
-                {"matrix": [6, 0], "x": 14, "y": 3},
-
-                {"matrix": [3, 0], "x": 4, "y": 4},
-                {"matrix": [3, 1], "x": 5, "y": 4},
-                {"matrix": [3, 2], "x": 6, "y": 4},
-
-                {"matrix": [7, 2], "x": 8, "y": 4},
-                {"matrix": [7, 1], "x": 9, "y": 4},
-                {"matrix": [7, 0], "x": 10, "y": 4}
-            ]
-        },
-        "LAYOUT_split_3x5_3_encoder": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.5},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.5},
-                {"matrix": [0, 4], "x": 4, "y": 0.75},
-
-                {"matrix": [4, 4], "x": 10, "y": 0.75},
-                {"matrix": [4, 3], "x": 11, "y": 0.5},
-                {"matrix": [4, 2], "x": 12, "y": 0},
-                {"matrix": [4, 1], "x": 13, "y": 0.5},
-                {"matrix": [4, 0], "x": 14, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.75},
-
-                {"matrix": [5, 4], "x": 10, "y": 1.75},
-                {"matrix": [5, 3], "x": 11, "y": 1.5},
-                {"matrix": [5, 2], "x": 12, "y": 1},
-                {"matrix": [5, 1], "x": 13, "y": 1.5},
-                {"matrix": [5, 0], "x": 14, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.5},
-                {"matrix": [2, 4], "x": 4, "y": 2.75},
-                {"matrix": [3, 4], "x": 5.5, "y": 2.75},
-
-                {"matrix": [7, 4], "x": 8.5, "y": 2.75},
-                {"matrix": [6, 4], "x": 10, "y": 2.75},
-                {"matrix": [6, 3], "x": 11, "y": 2.5},
-                {"matrix": [6, 2], "x": 12, "y": 2},
-                {"matrix": [6, 1], "x": 13, "y": 2.5},
-                {"matrix": [6, 0], "x": 14, "y": 3},
-
-                {"matrix": [3, 0], "x": 4, "y": 4},
-                {"matrix": [3, 1], "x": 5, "y": 4},
-                {"matrix": [3, 2], "x": 6, "y": 4},
-
-                {"matrix": [7, 2], "x": 8, "y": 4},
-                {"matrix": [7, 1], "x": 9, "y": 4},
-                {"matrix": [7, 0], "x": 10, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json
new file mode 100644
index 00000000000..f4bab524196
--- /dev/null
+++ b/keyboards/pteron36/keyboard.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "Pteron36",
+    "manufacturer": "Harshit Goel",
+    "url": "",
+    "maintainer": "harshitgoel96",
+    "usb": {
+        "vid": "0x4847",
+        "pid": "0x5054",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "oled": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2"],
+        "rows": ["E6", "D7", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 7
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D3",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5"}
+                ]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 10
+    },
+    "ws2812": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.75},
+                {"matrix": [4, 3], "x": 11, "y": 0.5},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [4, 1], "x": 13, "y": 0.5},
+                {"matrix": [4, 0], "x": 14, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+                {"matrix": [5, 4], "x": 10, "y": 1.75},
+                {"matrix": [5, 3], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 1], "x": 13, "y": 1.5},
+                {"matrix": [5, 0], "x": 14, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.75},
+
+                {"matrix": [6, 4], "x": 10, "y": 2.75},
+                {"matrix": [6, 3], "x": 11, "y": 2.5},
+                {"matrix": [6, 2], "x": 12, "y": 2},
+                {"matrix": [6, 1], "x": 13, "y": 2.5},
+                {"matrix": [6, 0], "x": 14, "y": 3},
+
+                {"matrix": [3, 0], "x": 4, "y": 4},
+                {"matrix": [3, 1], "x": 5, "y": 4},
+                {"matrix": [3, 2], "x": 6, "y": 4},
+
+                {"matrix": [7, 2], "x": 8, "y": 4},
+                {"matrix": [7, 1], "x": 9, "y": 4},
+                {"matrix": [7, 0], "x": 10, "y": 4}
+            ]
+        },
+        "LAYOUT_split_3x5_3_encoder": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+                {"matrix": [4, 4], "x": 10, "y": 0.75},
+                {"matrix": [4, 3], "x": 11, "y": 0.5},
+                {"matrix": [4, 2], "x": 12, "y": 0},
+                {"matrix": [4, 1], "x": 13, "y": 0.5},
+                {"matrix": [4, 0], "x": 14, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+                {"matrix": [5, 4], "x": 10, "y": 1.75},
+                {"matrix": [5, 3], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 1], "x": 13, "y": 1.5},
+                {"matrix": [5, 0], "x": 14, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.75},
+                {"matrix": [3, 4], "x": 5.5, "y": 2.75},
+
+                {"matrix": [7, 4], "x": 8.5, "y": 2.75},
+                {"matrix": [6, 4], "x": 10, "y": 2.75},
+                {"matrix": [6, 3], "x": 11, "y": 2.5},
+                {"matrix": [6, 2], "x": 12, "y": 2},
+                {"matrix": [6, 1], "x": 13, "y": 2.5},
+                {"matrix": [6, 0], "x": 14, "y": 3},
+
+                {"matrix": [3, 0], "x": 4, "y": 4},
+                {"matrix": [3, 1], "x": 5, "y": 4},
+                {"matrix": [3, 2], "x": 6, "y": 4},
+
+                {"matrix": [7, 2], "x": 8, "y": 4},
+                {"matrix": [7, 1], "x": 9, "y": 4},
+                {"matrix": [7, 0], "x": 10, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk
deleted file mode 100644
index d07878747eb..00000000000
--- a/keyboards/pteron36/rules.mk
+++ /dev/null
@@ -1,15 +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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-OLED_ENABLE = yes           # OLED display
-ENCODER_ENABLE = yes        # Encoder support
-SPLIT_KEYBOARD = yes        # Split enable
diff --git a/keyboards/qvex/lynepad2/matrix.c b/keyboards/qvex/lynepad2/matrix.c
index 878ee6e2f72..89c56b8d406 100644
--- a/keyboards/qvex/lynepad2/matrix.c
+++ b/keyboards/qvex/lynepad2/matrix.c
@@ -14,13 +14,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "util.h"
 #include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
+#include "wait.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
deleted file mode 100644
index 8e59e903ac0..00000000000
--- a/keyboards/qwertyydox/config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright 2018 Ayden <aydenvis@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define MOUSEKEY_DELAY             150
-#define MOUSEKEY_INTERVAL          20
-#define MOUSEKEY_MAX_SPEED         10
-#define MOUSEKEY_TIME_TO_MAX       10
-#define MOUSEKEY_WHEEL_MAX_SPEED   8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
deleted file mode 100644
index 5f1eb80da84..00000000000
--- a/keyboards/qwertyydox/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "keyboard_name": "QWERTYYdox",
-  "manufacturer": "AYDENandDAD Youtube",
-  "identifier": "0x1256",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xCEEB",
-    "pid": "0x1256",
-    "device_version": "1.0.0"
-  },
-  "matrix_pins": {
-    "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
-    "rows": ["B6", "B2", "B3", "B1"]
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 12,
-    "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": "D6"
-  },
-  "diode_direction": "COL2ROW",
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "bootloader": "caterina",
-  "processor": "atmega32u4",
-  "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": [4, 6], "x": 9, "y": 0},
-        {"matrix": [4, 5], "x": 10, "y": 0},
-        {"matrix": [4, 4], "x": 11, "y": 0},
-        {"matrix": [4, 3], "x": 12, "y": 0},
-        {"matrix": [4, 2], "x": 13, "y": 0},
-        {"matrix": [4, 1], "x": 14, "y": 0},
-        {"matrix": [4, 0], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 0.25, "y": 1},
-        {"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": [5, 6], "x": 9.25, "y": 1},
-        {"matrix": [5, 5], "x": 10.25, "y": 1},
-        {"matrix": [5, 4], "x": 11.25, "y": 1},
-        {"matrix": [5, 3], "x": 12.25, "y": 1},
-        {"matrix": [5, 2], "x": 13.25, "y": 1},
-        {"matrix": [5, 1], "x": 14.25, "y": 1},
-        {"matrix": [5, 0], "x": 15.25, "y": 1},
-
-        {"matrix": [2, 0], "x": 0.75, "y": 2},
-        {"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": [6, 5], "x": 9.75, "y": 2},
-        {"matrix": [6, 4], "x": 10.75, "y": 2},
-        {"matrix": [6, 3], "x": 11.75, "y": 2},
-        {"matrix": [6, 2], "x": 12.75, "y": 2},
-        {"matrix": [6, 1], "x": 13.75, "y": 2},
-        {"matrix": [6, 0], "x": 14.75, "y": 2},
-
-        {"matrix": [3, 0], "x": 0.75, "y": 3},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3.33},
-        {"matrix": [3, 5], "x": 5.75, "y": 3.67},
-        {"matrix": [3, 6], "x": 6.75, "y": 4},
-
-        {"matrix": [7, 6], "x": 8.75, "y": 4},
-        {"matrix": [7, 5], "x": 9.75, "y": 3.67},
-        {"matrix": [7, 4], "x": 10.75, "y": 3.33},
-        {"matrix": [7, 3], "x": 11.75, "y": 3},
-        {"matrix": [7, 2], "x": 12.75, "y": 3},
-        {"matrix": [7, 1], "x": 13.75, "y": 3},
-        {"matrix": [7, 0], "x": 14.75, "y": 3}
-      ]
-    }
-  }
-}
diff --git a/keyboards/qwertyydox/rev1/config.h b/keyboards/qwertyydox/rev1/config.h
new file mode 100644
index 00000000000..e5dc39eb775
--- /dev/null
+++ b/keyboards/qwertyydox/rev1/config.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2018 Ayden <aydenvis@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define MOUSEKEY_DELAY             150
+#define MOUSEKEY_INTERVAL          20
+#define MOUSEKEY_MAX_SPEED         10
+#define MOUSEKEY_TIME_TO_MAX       10
+#define MOUSEKEY_WHEEL_MAX_SPEED   8
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/qwertyydox/rev1/keyboard.json b/keyboards/qwertyydox/rev1/keyboard.json
new file mode 100644
index 00000000000..f2a335aa027
--- /dev/null
+++ b/keyboards/qwertyydox/rev1/keyboard.json
@@ -0,0 +1,119 @@
+{
+  "keyboard_name": "QWERTYYdox",
+  "manufacturer": "AYDENandDAD Youtube",
+  "identifier": "0x1256",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xCEEB",
+    "pid": "0x1256",
+    "device_version": "1.0.0"
+  },
+  "features": {
+    "mousekey": true
+  },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
+    "rows": ["B6", "B2", "B3", "B1"]
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 12,
+    "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": "D6"
+  },
+  "diode_direction": "COL2ROW",
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
+  "bootloader": "caterina",
+  "processor": "atmega32u4",
+  "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": [4, 6], "x": 9, "y": 0},
+        {"matrix": [4, 5], "x": 10, "y": 0},
+        {"matrix": [4, 4], "x": 11, "y": 0},
+        {"matrix": [4, 3], "x": 12, "y": 0},
+        {"matrix": [4, 2], "x": 13, "y": 0},
+        {"matrix": [4, 1], "x": 14, "y": 0},
+        {"matrix": [4, 0], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0.25, "y": 1},
+        {"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": [5, 6], "x": 9.25, "y": 1},
+        {"matrix": [5, 5], "x": 10.25, "y": 1},
+        {"matrix": [5, 4], "x": 11.25, "y": 1},
+        {"matrix": [5, 3], "x": 12.25, "y": 1},
+        {"matrix": [5, 2], "x": 13.25, "y": 1},
+        {"matrix": [5, 1], "x": 14.25, "y": 1},
+        {"matrix": [5, 0], "x": 15.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0.75, "y": 2},
+        {"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": [6, 5], "x": 9.75, "y": 2},
+        {"matrix": [6, 4], "x": 10.75, "y": 2},
+        {"matrix": [6, 3], "x": 11.75, "y": 2},
+        {"matrix": [6, 2], "x": 12.75, "y": 2},
+        {"matrix": [6, 1], "x": 13.75, "y": 2},
+        {"matrix": [6, 0], "x": 14.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0.75, "y": 3},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.33},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.67},
+        {"matrix": [3, 6], "x": 6.75, "y": 4},
+
+        {"matrix": [7, 6], "x": 8.75, "y": 4},
+        {"matrix": [7, 5], "x": 9.75, "y": 3.67},
+        {"matrix": [7, 4], "x": 10.75, "y": 3.33},
+        {"matrix": [7, 3], "x": 11.75, "y": 3},
+        {"matrix": [7, 2], "x": 12.75, "y": 3},
+        {"matrix": [7, 1], "x": 13.75, "y": 3},
+        {"matrix": [7, 0], "x": 14.75, "y": 3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/qwertyydox/rev1/rules.mk b/keyboards/qwertyydox/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk
index 9bcd2f0741f..688444b5663 100644
--- a/keyboards/qwertyydox/rules.mk
+++ b/keyboards/qwertyydox/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = qwertyydox/rev1
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
index 2bec0c52af2..ca8434fdd7d 100644
--- a/keyboards/rate/pistachio/rev1/info.json
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -4,6 +4,9 @@
         "led_count": 2,
         "split_count": [1, 1]
     },
+    "split": {
+        "enabled": true
+    },
     "ws2812": {
         "pin": "D2"
     },
diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
index dda6154e66d..09f976d0e64 100644
--- a/keyboards/rate/pistachio/rev1/rules.mk
+++ b/keyboards/rate/pistachio/rev1/rules.mk
@@ -10,4 +10,3 @@ 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
-SPLIT_KEYBOARD = yes        # Enable split keyboard
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
index 9f0c169b873..0bca53aca36 100644
--- a/keyboards/rate/pistachio/rev2/info.json
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -8,6 +8,9 @@
         "max_brightness": 195,
         "split_count": [38, 46]
     },
+    "split": {
+        "enabled": true
+    },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
         "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
index dda6154e66d..09f976d0e64 100644
--- a/keyboards/rate/pistachio/rev2/rules.mk
+++ b/keyboards/rate/pistachio/rev2/rules.mk
@@ -10,4 +10,3 @@ 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
-SPLIT_KEYBOARD = yes        # Enable split keyboard
diff --git a/keyboards/rate/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c
index 6cbfb6dfea1..bb962c76e22 100644
--- a/keyboards/rate/pistachio_pro/matrix.c
+++ b/keyboards/rate/pistachio_pro/matrix.c
@@ -14,10 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json
index 3960f575ab9..2a4dd3f7f3d 100644
--- a/keyboards/recompile_keys/choco60/rev1/info.json
+++ b/keyboards/recompile_keys/choco60/rev1/info.json
@@ -5,6 +5,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk
index b74db0a672b..4d82dff69aa 100644
--- a/keyboards/recompile_keys/choco60/rev1/rules.mk
+++ b/keyboards/recompile_keys/choco60/rev1/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes        # Enable split keyboard
diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json
index c03e8678f6b..6565dc98347 100644
--- a/keyboards/recompile_keys/choco60/rev2/info.json
+++ b/keyboards/recompile_keys/choco60/rev2/info.json
@@ -5,6 +5,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk
index ca4dbbab2fa..fa6fbf34d9f 100644
--- a/keyboards/recompile_keys/choco60/rev2/rules.mk
+++ b/keyboards/recompile_keys/choco60/rev2/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
deleted file mode 100644
index 76a9302eff1..00000000000
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "keyboard_name": "Cocoa40",
-    "manufacturer": "recompile keys",
-    "url": "https://keys.recompile.net/projects/cocoa40/",
-    "maintainer": "Naoto Takai",
-    "usb": {
-        "vid": "0xC0C0",
-        "pid": "0x4000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
-        "rows": ["F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "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": [4, 0], "x": 7.25, "y": 0},
-                {"matrix": [4, 1], "x": 8.25, "y": 0},
-                {"matrix": [4, 2], "x": 9.25, "y": 0},
-                {"matrix": [4, 3], "x": 10.25, "y": 0},
-                {"matrix": [4, 4], "x": 11.25, "y": 0},
-                {"matrix": [4, 5], "x": 12.25, "y": 0},
-                {"matrix": [4, 6], "x": 13.25, "y": 0},
-                {"matrix": [4, 7], "x": 14.25, "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": [5, 0], "x": 7.5, "y": 1},
-                {"matrix": [5, 1], "x": 8.5, "y": 1},
-                {"matrix": [5, 2], "x": 9.5, "y": 1},
-                {"matrix": [5, 3], "x": 10.5, "y": 1},
-                {"matrix": [5, 4], "x": 11.5, "y": 1},
-                {"matrix": [5, 5], "x": 12.5, "y": 1},
-                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75},
-
-                {"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": [6, 0], "x": 8, "y": 2},
-                {"matrix": [6, 1], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 3], "x": 11, "y": 2},
-                {"matrix": [6, 4], "x": 12, "y": 2},
-                {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25},
-                {"matrix": [6, 6], "x": 14.25, "y": 2},
-
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
-                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
-
-                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75},
-                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5},
-                {"matrix": [7, 3], "x": 11.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/recompile_keys/cocoa40/keyboard.json b/keyboards/recompile_keys/cocoa40/keyboard.json
new file mode 100644
index 00000000000..f964ff6621d
--- /dev/null
+++ b/keyboards/recompile_keys/cocoa40/keyboard.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Cocoa40",
+    "manufacturer": "recompile keys",
+    "url": "https://keys.recompile.net/projects/cocoa40/",
+    "maintainer": "Naoto Takai",
+    "usb": {
+        "vid": "0xC0C0",
+        "pid": "0x4000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "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": [4, 0], "x": 7.25, "y": 0},
+                {"matrix": [4, 1], "x": 8.25, "y": 0},
+                {"matrix": [4, 2], "x": 9.25, "y": 0},
+                {"matrix": [4, 3], "x": 10.25, "y": 0},
+                {"matrix": [4, 4], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [4, 6], "x": 13.25, "y": 0},
+                {"matrix": [4, 7], "x": 14.25, "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": [5, 0], "x": 7.5, "y": 1},
+                {"matrix": [5, 1], "x": 8.5, "y": 1},
+                {"matrix": [5, 2], "x": 9.5, "y": 1},
+                {"matrix": [5, 3], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75},
+
+                {"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": [6, 0], "x": 8, "y": 2},
+                {"matrix": [6, 1], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 4], "x": 12, "y": 2},
+                {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25},
+                {"matrix": [6, 6], "x": 14.25, "y": 2},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75},
+                {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5},
+                {"matrix": [7, 3], "x": 11.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk
deleted file mode 100644
index 10e75fed2e2..00000000000
--- a/keyboards/recompile_keys/cocoa40/rules.mk
+++ /dev/null
@@ -1,13 +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 = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/redox/wireless/matrix.c b/keyboards/redox/wireless/matrix.c
index 9c50c9cecea..92960b916df 100644
--- a/keyboards/redox/wireless/matrix.c
+++ b/keyboards/redox/wireless/matrix.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
index 12e8f089b59..c4e890f5577 100644
--- a/keyboards/redox_media/info.json
+++ b/keyboards/redox_media/info.json
@@ -19,6 +19,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk
index 786e3ac0293..5ad7700a767 100644
--- a/keyboards/redox_media/rules.mk
+++ b/keyboards/redox_media/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
 
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c
index aa2cd8e5107..391a923f165 100755
--- a/keyboards/redscarf_iiplus/verb/matrix.c
+++ b/keyboards/redscarf_iiplus/verb/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c
index aa2cd8e5107..391a923f165 100755
--- a/keyboards/redscarf_iiplus/verc/matrix.c
+++ b/keyboards/redscarf_iiplus/verc/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c
index 382847e9419..b2046db2cef 100644
--- a/keyboards/redscarf_iiplus/verd/matrix.c
+++ b/keyboards/redscarf_iiplus/verd/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json
index 7374f6cd478..98265c6dd90 100644
--- a/keyboards/rgbkb/mun/rev1/keyboard.json
+++ b/keyboards/rgbkb/mun/rev1/keyboard.json
@@ -102,6 +102,7 @@
         "tap_keycode_delay": 5
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A9",
         "transport": {
             "sync": {
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 4269e3b0a1f..04d4c554ad5 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -22,7 +22,6 @@ OLED_ENABLE = yes
 
 ENCODER_ENABLE = yes
 
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index 874b4ece22e..16b61d9e020 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -82,6 +82,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3"
     },
     "tapping": {
diff --git a/keyboards/rgbkb/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c
index 21b4503ab9f..f5997bac007 100644
--- a/keyboards/rgbkb/sol/rev1/rev1.c
+++ b/keyboards/rgbkb/sol/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "sol.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index ac57e4e74eb..f7ec84cfce3 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -77,6 +77,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3"
     },
     "tapping": {
diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c
index e00c4856098..cd2c9f96452 100644
--- a/keyboards/rgbkb/sol/rev2/rev2.c
+++ b/keyboards/rgbkb/sol/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "sol.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk
index 2cacb68825d..c956bb9f5f1 100644
--- a/keyboards/rgbkb/sol/rules.mk
+++ b/keyboards/rgbkb/sol/rules.mk
@@ -1,7 +1,6 @@
 # Custom local font file
 OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
 
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 
 DEFAULT_FOLDER = rgbkb/sol/rev2
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index 96213156f0c..3b8b7d060c8 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -103,6 +103,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "dip_switch": {
             "right": {
                 "pins": ["A14", "B0"]
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 227219e3024..bf22130a55a 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -26,7 +26,6 @@ OLED_ENABLE = yes
 
 ENCODER_ENABLE = yes
 
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
diff --git a/keyboards/rgbkb/zen/info.json b/keyboards/rgbkb/zen/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/rgbkb/zen/info.json
@@ -0,0 +1,5 @@
+{
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
index b044652afd2..c84d9574af8 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c
@@ -10,13 +10,6 @@ enum layer_number {
     _NAV
 };
 
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV,
-
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Qwerty
@@ -67,32 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 #endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    //case COLEMAK:
-      //if (record->event.pressed) {
-        //#ifdef AUDIO_ENABLE
-          //PLAY_SONG(tone_colemak);
-        //#endif
-        //persistant_default_layer_set(1UL<<_COLEMAK);
-      //}
-      //return false;
-      //break;
-  }
-  return true;
-}
diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
index 4b289b095fd..1776c6b5856 100644
--- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c
@@ -10,11 +10,6 @@ enum layer_number {
     _NAV
 };
 
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Qwerty
@@ -84,25 +79,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    //case COLEMAK:
-      //if (record->event.pressed) {
-        //set_single_persistent_default_layer(1UL<<_COLEMAK);
-      //}
-      //return false;
-      //break;
-  }
-  return true;
-}
-
-
 #if OLED_ENABLE
 const char* layer_name_user(uint32_t layer) {
   switch (layer) {
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
index 3c692c76fce..28653a7d5f8 100644
--- a/keyboards/rgbkb/zen/rules.mk
+++ b/keyboards/rgbkb/zen/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight
 
 DEFAULT_FOLDER = rgbkb/zen/rev2
diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
index 3bd412cc3b3..851842d0815 100644
--- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json
+++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
@@ -23,6 +23,7 @@
       ]
     },
     "split": {
+      "enabled": true,
       "soft_serial_pin": "D3"
     },
     "rgblight": {
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index bc168c39832..dfdffe3c3a8 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = rgbkb/zygomorph/rev1
 
 # Disable unsupported hardware
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 61b73bd0c03..cb8b0330c2f 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -15,8 +15,11 @@
  */
 
 #include "keycode_lookup.h"
+#include "quantum_keycodes.h"
+#include "keymap_us.h"
 #include "print.h"
 #include "via.h"
+#include "util.h"
 
 #define num_keycodes ARRAY_SIZE(lookup_table)
 static char UNKNOWN_KEYCODE[] = "UNKNOWN";
@@ -289,7 +292,7 @@ lookup_table_t lookup_table[333] =
  {"KC_QUES", KC_QUES},
  {"QK_BOOT", QK_BOOT},
  {"DB_TOGG", DB_TOGG},
- {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
+ {"NK_TOGG", NK_TOGG},
  {"QK_GESC", QK_GESC},
  {"AU_ON", AU_ON},
  {"AU_OFF", AU_OFF},
diff --git a/keyboards/rocketboard_16/keycode_lookup.h b/keyboards/rocketboard_16/keycode_lookup.h
index 35f0b66f25f..06f0efb53b6 100644
--- a/keyboards/rocketboard_16/keycode_lookup.h
+++ b/keyboards/rocketboard_16/keycode_lookup.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
 
 typedef struct
 {
diff --git a/keyboards/rose75/info.json b/keyboards/rose75/info.json
new file mode 100644
index 00000000000..9306cb211b6
--- /dev/null
+++ b/keyboards/rose75/info.json
@@ -0,0 +1,128 @@
+{
+    "manufacturer": "Matthijs Muller",
+    "keyboard_name": "ROSE75",
+    "maintainer": "Matthijs Muller",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["GP23", "GP21", "GP20", "GP19", "GP28", "GP12", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP10"],
+        "rows": ["GP27", "GP26", "GP25", "GP24", "GP18", "GP22"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 8},
+            {"matrix": [0, 1], "x": 15, "y": 15, "flags": 8}
+        ],
+        "max_brightness": 210,
+        "sleep": true
+    },
+    "url": "https://github.com/Smollchungus",
+    "usb": {
+        "device_version": "0.0.1",
+        "force_nkro": true,
+        "pid": "0x7503",
+        "vid": "0x5363"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP29"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11.5, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12.5, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0},
+                {"label": "Del", "matrix": [0, 14], "x": 15, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "LB", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "RB", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "Pipe", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2.5},
+                {"label": "Capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "Quote", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3.5},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14, "y": 4.5},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5},
+                {"label": "Control", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"label": "Left", "matrix": [5, 12], "x": 13, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/rose75/keymaps/default/keymap.c b/keyboards/rose75/keymaps/default/keymap.c
new file mode 100644
index 00000000000..043edaecbc1
--- /dev/null
+++ b/keyboards/rose75/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_END,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/rose75/keymaps/via/keymap.c b/keyboards/rose75/keymaps/via/keymap.c
new file mode 100644
index 00000000000..043edaecbc1
--- /dev/null
+++ b/keyboards/rose75/keymaps/via/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_END,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/rose75/keymaps/via/rules.mk b/keyboards/rose75/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/rose75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rose75/readme.md b/keyboards/rose75/readme.md
new file mode 100644
index 00000000000..85d4763d9b4
--- /dev/null
+++ b/keyboards/rose75/readme.md
@@ -0,0 +1,24 @@
+# rose75
+
+![rose75](https://i.imgur.com/f64Ttib.png)
+
+* Keyboard Maintainer: [Matthijs Muller](https://github.com/Smollchungus)
+* Hardware Supported: Rose75 Keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rose75:default
+
+Flashing example for this keyboard:
+
+    make rose75:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/rose75/rose75.c b/keyboards/rose75/rose75.c
new file mode 100644
index 00000000000..d84f3da1d43
--- /dev/null
+++ b/keyboards/rose75/rose75.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Matthijs Muller (@Smollchungus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+         return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(0, 200, 0, 0);
+        rgb_matrix_set_color(1, 200, 0, 0);
+    } else {
+        rgb_matrix_set_color(0, 0, 0, 0);
+        rgb_matrix_set_color(1, 0, 0, 0);
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/rose75/rules.mk
similarity index 100%
rename from keyboards/handwired/qc60/proto/rules.mk
rename to keyboards/rose75/rules.mk
diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json
new file mode 100644
index 00000000000..7ed0b5bd97a
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/info.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "HACKBOARD",
+    "manufacturer": "rot13labs",
+    "url": "https://rot13labs.com",
+    "maintainer": "c0ldbru",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xCAFE",
+        "device_version": "1.0.0"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"],
+        "rows": ["C2", "C3", "C7", "C4", "C6", "C5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 1], "x": 6, "y": 0, "w": 0.75, "h": 0.75},
+
+                {"matrix": [0, 0], "x": 0, "y": 1},
+
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 1},
+                {"matrix": [0, 7], "x": 7.5, "y": 1},
+                {"matrix": [0, 8], "x": 8.5, "y": 1},
+                {"matrix": [0, 9], "x": 9.5, "y": 1},
+
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [0, 12], "x": 12, "y": 1},
+                {"matrix": [0, 13], "x": 13, "y": 1},
+                {"matrix": [0, 14], "x": 14, "y": 1},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 1},
+                {"matrix": [0, 16], "x": 16.25, "y": 1},
+                {"matrix": [0, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 2.25},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+                {"matrix": [1, 8], "x": 8, "y": 2.25},
+                {"matrix": [1, 9], "x": 9, "y": 2.25},
+                {"matrix": [1, 10], "x": 10, "y": 2.25},
+                {"matrix": [1, 11], "x": 11, "y": 2.25},
+                {"matrix": [1, 12], "x": 12, "y": 2.25},
+                {"matrix": [1, 13], "x": 13, "y": 2.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 3.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 3.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 3.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 3.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 3.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 3.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 3.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 3.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 4.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 4.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 4.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 4.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 5.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 5.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 5.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 5.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 5.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 5.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 5.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 5.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 6.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 6.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 6.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 6.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 6.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 6.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c
new file mode 100644
index 00000000000..542d541bf31
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 rot13labs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+                                                      KC_NO,
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,   KC_PSCR,  KC_SCRL, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,  KC_INS,   KC_HOME, KC_PGUP,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,  KC_DEL,   KC_END,  KC_PGDN,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+      KC_LSFT,          KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                     KC_UP,
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                 KC_RALT, KC_RGUI, MO(1),    KC_RCTL,            KC_LEFT, KC_DOWN, KC_RIGHT),
+  
+  [1] = LAYOUT(
+                                                      KC_NO,
+      _______,          _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, QK_BOOT,  _______,_______,_______,_______,_______, _______, _______,  _______, _______,  _______,  _______, _______,
+      _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______,
+      _______,          _______, _______, _______,_______,_______,_______,_______,_______, _______, _______,  _______,                     KC_VOLU,
+      _______, _______, _______,                          _______,                _______, _______, _______,  _______,            _______, KC_VOLD, _______)
+};
diff --git a/keyboards/rot13labs/hackboard/readme.md b/keyboards/rot13labs/hackboard/readme.md
new file mode 100644
index 00000000000..c14b742326c
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/readme.md
@@ -0,0 +1,22 @@
+# HACKBOARD
+
+![hackboard](https://i.imgur.com/te8feiB.png)
+
+A TKL keyboard for hackers based on the mysterium platform by coseyfannitutti
+
+* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru)
+* Hardware Supported: HACKBOARD // atmega32a
+* Hardware Availability: [rot13labs](https://rot13labs.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rot13labs/hackboard:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+You can enter the bootloader to flash on new firmware in one of two ways:
+
+* **Bootmagic**: Hold the ESC key (top left key) and hit reset
+* **Boot button**: Hold the boot button on the top of the PCB and hit reset
\ No newline at end of file
diff --git a/keyboards/rot13labs/hackboard/rules.mk b/keyboards/rot13labs/hackboard/rules.mk
new file mode 100644
index 00000000000..c2ee0bc86f9
--- /dev/null
+++ b/keyboards/rot13labs/hackboard/rules.mk
@@ -0,0 +1,2 @@
+# Processor frequency
+F_CPU = 16000000
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index 591d6228b72..71bb374bfb7 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -30,6 +30,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "ws2812": {
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 1c7bdc0c3cd..ec47c1e0348 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -1,6 +1,5 @@
 EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes    # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
 RGB_MATRIX_ENABLE = no
 ENCODER_ENABLE = no
 LTO_ENABLE = yes
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index c7eacfa19a9..4cbe55ac766 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
 
 DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/ryanskidmore/rskeys100/matrix.c b/keyboards/ryanskidmore/rskeys100/matrix.c
index faefb29c84e..2ab9eafd7f5 100644
--- a/keyboards/ryanskidmore/rskeys100/matrix.c
+++ b/keyboards/ryanskidmore/rskeys100/matrix.c
@@ -17,10 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdbool.h>
 #include "matrix.h"
 #include <util/delay.h>
-#include "quantum.h"
 
 static const uint32_t col_values[24] = SHR_COLS;
 
diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
index 89e675db525..3ea79da589d 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "rgblight": {
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index 171b119b34d..09cad7556c4 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
deleted file mode 100644
index 35b3d7ec170..00000000000
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "keyboard_name": "7splus",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEAE7",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
-        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 31,
-        "split_count": [11, 20],
-        "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",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [7, 0], "x": 7.5, "y": 0},
-                {"matrix": [7, 1], "x": 8.5, "y": 0},
-                {"matrix": [7, 2], "x": 9.5, "y": 0},
-
-                {"matrix": [7, 3], "x": 10.75, "y": 0},
-                {"matrix": [7, 4], "x": 11.75, "y": 0},
-                {"matrix": [7, 5], "x": 12.75, "y": 0},
-                {"matrix": [7, 6], "x": 13.75, "y": 0},
-
-                {"matrix": [7, 7], "x": 15, "y": 0},
-                {"matrix": [13, 0], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-
-                {"matrix": [8, 0], "x": 7, "y": 1.25},
-                {"matrix": [8, 1], "x": 8, "y": 1.25},
-                {"matrix": [8, 2], "x": 9, "y": 1.25},
-                {"matrix": [8, 3], "x": 10, "y": 1.25},
-                {"matrix": [8, 4], "x": 11, "y": 1.25},
-                {"matrix": [8, 5], "x": 12, "y": 1.25},
-                {"matrix": [8, 6], "x": 13, "y": 1.25},
-                {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2},
-                {"matrix": [13, 2], "x": 16, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
-                {"matrix": [9, 0], "x": 7.5, "y": 2.25},
-                {"matrix": [9, 1], "x": 8.5, "y": 2.25},
-                {"matrix": [9, 2], "x": 9.5, "y": 2.25},
-                {"matrix": [9, 3], "x": 10.5, "y": 2.25},
-                {"matrix": [9, 4], "x": 11.5, "y": 2.25},
-                {"matrix": [9, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [9, 6], "x": 13.5, "y": 2.25},
-                {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5},
-                {"matrix": [13, 3], "x": 16, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-
-                {"matrix": [10, 0], "x": 7.75, "y": 3.25},
-                {"matrix": [10, 1], "x": 8.75, "y": 3.25},
-                {"matrix": [10, 2], "x": 9.75, "y": 3.25},
-                {"matrix": [10, 3], "x": 10.75, "y": 3.25},
-                {"matrix": [10, 4], "x": 11.75, "y": 3.25},
-                {"matrix": [10, 5], "x": 12.75, "y": 3.25},
-                {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25},
-                {"matrix": [10, 7], "x": 16, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-
-                {"matrix": [11, 0], "x": 8.25, "y": 4.25},
-                {"matrix": [11, 1], "x": 9.25, "y": 4.25},
-                {"matrix": [11, 2], "x": 10.25, "y": 4.25},
-                {"matrix": [11, 3], "x": 11.25, "y": 4.25},
-                {"matrix": [11, 4], "x": 12.25, "y": 4.25},
-                {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75},
-                {"matrix": [11, 7], "x": 15, "y": 4.25},
-                {"matrix": [12, 7], "x": 16, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2},
-                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-
-                {"matrix": [12, 0], "x": 7.75, "y": 5.25},
-                {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75},
-                {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25},
-                {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25},
-                {"matrix": [12, 5], "x": 14, "y": 5.25},
-                {"matrix": [12, 6], "x": 15, "y": 5.25},
-                {"matrix": [13, 4], "x": 16, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/salicylic_acid3/7splus/keyboard.json b/keyboards/salicylic_acid3/7splus/keyboard.json
new file mode 100644
index 00000000000..38ca750cd47
--- /dev/null
+++ b/keyboards/salicylic_acid3/7splus/keyboard.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "7splus",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEAE7",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+        "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 31,
+        "split_count": [11, 20],
+        "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",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [7, 1], "x": 8.5, "y": 0},
+                {"matrix": [7, 2], "x": 9.5, "y": 0},
+
+                {"matrix": [7, 3], "x": 10.75, "y": 0},
+                {"matrix": [7, 4], "x": 11.75, "y": 0},
+                {"matrix": [7, 5], "x": 12.75, "y": 0},
+                {"matrix": [7, 6], "x": 13.75, "y": 0},
+
+                {"matrix": [7, 7], "x": 15, "y": 0},
+                {"matrix": [13, 0], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [8, 0], "x": 7, "y": 1.25},
+                {"matrix": [8, 1], "x": 8, "y": 1.25},
+                {"matrix": [8, 2], "x": 9, "y": 1.25},
+                {"matrix": [8, 3], "x": 10, "y": 1.25},
+                {"matrix": [8, 4], "x": 11, "y": 1.25},
+                {"matrix": [8, 5], "x": 12, "y": 1.25},
+                {"matrix": [8, 6], "x": 13, "y": 1.25},
+                {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2},
+                {"matrix": [13, 2], "x": 16, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [9, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [9, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [13, 3], "x": 16, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+
+                {"matrix": [10, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [10, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [10, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [10, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [10, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25},
+                {"matrix": [10, 7], "x": 16, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+
+                {"matrix": [11, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [11, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [11, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [11, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [11, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [11, 7], "x": 15, "y": 4.25},
+                {"matrix": [12, 7], "x": 16, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+
+                {"matrix": [12, 0], "x": 7.75, "y": 5.25},
+                {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75},
+                {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25},
+                {"matrix": [12, 5], "x": 14, "y": 5.25},
+                {"matrix": [12, 6], "x": 15, "y": 5.25},
+                {"matrix": [13, 4], "x": 16, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk
deleted file mode 100644
index 124c57ba15a..00000000000
--- a/keyboards/salicylic_acid3/7splus/rules.mk
+++ /dev/null
@@ -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 = yes        # 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
deleted file mode 100644
index c802635334f..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "ajisai74",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEB54",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "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": [5, 0], "x": 6.75, "y": 0},
-                {"matrix": [5, 1], "x": 7.75, "y": 0},
-                {"matrix": [5, 2], "x": 8.75, "y": 0},
-                {"matrix": [5, 3], "x": 9.75, "y": 0},
-                {"matrix": [5, 4], "x": 10.75, "y": 0},
-                {"matrix": [5, 5], "x": 11.75, "y": 0},
-                {"matrix": [5, 6], "x": 12.75, "y": 0},
-                {"matrix": [5, 7], "x": 13.75, "y": 0},
-                {"matrix": [5, 8], "x": 14.75, "y": 0},
-                {"matrix": [6, 8], "x": 15.75, "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": [6, 0], "x": 7.25, "y": 1},
-                {"matrix": [6, 1], "x": 8.25, "y": 1},
-                {"matrix": [6, 2], "x": 9.25, "y": 1},
-                {"matrix": [6, 3], "x": 10.25, "y": 1},
-                {"matrix": [6, 4], "x": 11.25, "y": 1},
-                {"matrix": [6, 5], "x": 12.25, "y": 1},
-                {"matrix": [6, 6], "x": 13.25, "y": 1},
-                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
-                {"matrix": [7, 8], "x": 15.75, "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": [7, 0], "x": 7.5, "y": 2},
-                {"matrix": [7, 1], "x": 8.5, "y": 2},
-                {"matrix": [7, 2], "x": 9.5, "y": 2},
-                {"matrix": [7, 3], "x": 10.5, "y": 2},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 12.5, "y": 2},
-                {"matrix": [7, 6], "x": 13.5, "y": 2},
-                {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25},
-                {"matrix": [8, 8], "x": 15.75, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [4, 5], "x": 1.25, "y": 3},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8, "y": 3},
-                {"matrix": [8, 1], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
-                {"matrix": [8, 6], "x": 14.75, "y": 3},
-                {"matrix": [8, 7], "x": 15.75, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.25, "y": 4},
-                {"matrix": [9, 4], "x": 12.25, "y": 4},
-
-                {"matrix": [9, 6], "x": 13.75, "y": 4},
-                {"matrix": [9, 7], "x": 14.75, "y": 4},
-                {"matrix": [9, 8], "x": 15.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/salicylic_acid3/ajisai74/keyboard.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json
new file mode 100644
index 00000000000..b29c5bf178c
--- /dev/null
+++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "ajisai74",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEB54",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "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": [5, 0], "x": 6.75, "y": 0},
+                {"matrix": [5, 1], "x": 7.75, "y": 0},
+                {"matrix": [5, 2], "x": 8.75, "y": 0},
+                {"matrix": [5, 3], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 5], "x": 11.75, "y": 0},
+                {"matrix": [5, 6], "x": 12.75, "y": 0},
+                {"matrix": [5, 7], "x": 13.75, "y": 0},
+                {"matrix": [5, 8], "x": 14.75, "y": 0},
+                {"matrix": [6, 8], "x": 15.75, "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": [6, 0], "x": 7.25, "y": 1},
+                {"matrix": [6, 1], "x": 8.25, "y": 1},
+                {"matrix": [6, 2], "x": 9.25, "y": 1},
+                {"matrix": [6, 3], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 5], "x": 12.25, "y": 1},
+                {"matrix": [6, 6], "x": 13.25, "y": 1},
+                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+                {"matrix": [7, 8], "x": 15.75, "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": [7, 0], "x": 7.5, "y": 2},
+                {"matrix": [7, 1], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [7, 3], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 5], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 13.5, "y": 2},
+                {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25},
+                {"matrix": [8, 8], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [4, 5], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+                {"matrix": [8, 6], "x": 14.75, "y": 3},
+                {"matrix": [8, 7], "x": 15.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4},
+                {"matrix": [9, 4], "x": 12.25, "y": 4},
+
+                {"matrix": [9, 6], "x": 13.75, "y": 4},
+                {"matrix": [9, 7], "x": 14.75, "y": 4},
+                {"matrix": [9, 8], "x": 15.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/rules.mk
+++ /dev/null
@@ -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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
deleted file mode 100644
index 3b4df223632..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "keyboard_name": "ergoarrows",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEA54",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 86,
-        "split_count": [43, 43],
-        "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",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.5},
-
-                {"matrix": [6, 6], "x": 8.8, "y": 0.5},
-                {"matrix": [6, 5], "x": 9.8, "y": 0.25},
-                {"matrix": [6, 4], "x": 10.8, "y": 0.125},
-                {"matrix": [6, 3], "x": 11.8, "y": 0},
-                {"matrix": [6, 2], "x": 12.8, "y": 0.125},
-                {"matrix": [6, 1], "x": 13.8, "y": 0.375},
-                {"matrix": [6, 0], "x": 14.8, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-
-                {"matrix": [7, 6], "x": 8.8, "y": 1.5},
-                {"matrix": [7, 5], "x": 9.8, "y": 1.25},
-                {"matrix": [7, 4], "x": 10.8, "y": 1.125},
-                {"matrix": [7, 3], "x": 11.8, "y": 1},
-                {"matrix": [7, 2], "x": 12.8, "y": 1.125},
-                {"matrix": [7, 1], "x": 13.8, "y": 1.375},
-                {"matrix": [7, 0], "x": 14.8, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.5},
-
-                {"matrix": [8, 6], "x": 8.8, "y": 2.5},
-                {"matrix": [8, 5], "x": 9.8, "y": 2.25},
-                {"matrix": [8, 4], "x": 10.8, "y": 2.125},
-                {"matrix": [8, 3], "x": 11.8, "y": 2},
-                {"matrix": [8, 2], "x": 12.8, "y": 2.125},
-                {"matrix": [8, 1], "x": 13.8, "y": 2.375},
-                {"matrix": [8, 0], "x": 14.8, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-                {"matrix": [3, 6], "x": 6, "y": 3.5},
-
-                {"matrix": [9, 6], "x": 8.8, "y": 3.5},
-                {"matrix": [9, 5], "x": 9.8, "y": 3.25},
-                {"matrix": [9, 4], "x": 10.8, "y": 3.125},
-                {"matrix": [9, 3], "x": 11.8, "y": 3},
-                {"matrix": [9, 2], "x": 12.8, "y": 3.125},
-                {"matrix": [9, 1], "x": 13.8, "y": 3.375},
-                {"matrix": [9, 0], "x": 14.8, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2.125, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.375},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.375},
-                {"matrix": [4, 5], "x": 5.35, "y": 4.625},
-                {"matrix": [4, 6], "x": 6.4, "y": 5.125},
-
-                {"matrix": [10, 6], "x": 8.4, "y": 5.125},
-                {"matrix": [10, 5], "x": 9.45, "y": 4.625},
-                {"matrix": [10, 4], "x": 10.55, "y": 4.375},
-                {"matrix": [10, 3], "x": 11.55, "y": 4.375},
-                {"matrix": [10, 2], "x": 12.675, "y": 4.5},
-                {"matrix": [10, 1], "x": 13.8, "y": 4.375},
-                {"matrix": [10, 0], "x": 14.8, "y": 4.375},
-
-                {"matrix": [5, 1], "x": 1.125, "y": 5.5},
-                {"matrix": [5, 2], "x": 2.125, "y": 5.5},
-                {"matrix": [5, 3], "x": 3.125, "y": 5.5},
-
-                {"matrix": [11, 3], "x": 11.675, "y": 5.5},
-                {"matrix": [11, 2], "x": 12.675, "y": 5.5},
-                {"matrix": [11, 1], "x": 13.675, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/salicylic_acid3/ergoarrows/keyboard.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
new file mode 100644
index 00000000000..bb9956a2d07
--- /dev/null
+++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "ergoarrows",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA54",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 86,
+        "split_count": [43, 43],
+        "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",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+                {"matrix": [6, 6], "x": 8.8, "y": 0.5},
+                {"matrix": [6, 5], "x": 9.8, "y": 0.25},
+                {"matrix": [6, 4], "x": 10.8, "y": 0.125},
+                {"matrix": [6, 3], "x": 11.8, "y": 0},
+                {"matrix": [6, 2], "x": 12.8, "y": 0.125},
+                {"matrix": [6, 1], "x": 13.8, "y": 0.375},
+                {"matrix": [6, 0], "x": 14.8, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+                {"matrix": [7, 6], "x": 8.8, "y": 1.5},
+                {"matrix": [7, 5], "x": 9.8, "y": 1.25},
+                {"matrix": [7, 4], "x": 10.8, "y": 1.125},
+                {"matrix": [7, 3], "x": 11.8, "y": 1},
+                {"matrix": [7, 2], "x": 12.8, "y": 1.125},
+                {"matrix": [7, 1], "x": 13.8, "y": 1.375},
+                {"matrix": [7, 0], "x": 14.8, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+                {"matrix": [8, 6], "x": 8.8, "y": 2.5},
+                {"matrix": [8, 5], "x": 9.8, "y": 2.25},
+                {"matrix": [8, 4], "x": 10.8, "y": 2.125},
+                {"matrix": [8, 3], "x": 11.8, "y": 2},
+                {"matrix": [8, 2], "x": 12.8, "y": 2.125},
+                {"matrix": [8, 1], "x": 13.8, "y": 2.375},
+                {"matrix": [8, 0], "x": 14.8, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+                {"matrix": [9, 6], "x": 8.8, "y": 3.5},
+                {"matrix": [9, 5], "x": 9.8, "y": 3.25},
+                {"matrix": [9, 4], "x": 10.8, "y": 3.125},
+                {"matrix": [9, 3], "x": 11.8, "y": 3},
+                {"matrix": [9, 2], "x": 12.8, "y": 3.125},
+                {"matrix": [9, 1], "x": 13.8, "y": 3.375},
+                {"matrix": [9, 0], "x": 14.8, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2.125, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.375},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.375},
+                {"matrix": [4, 5], "x": 5.35, "y": 4.625},
+                {"matrix": [4, 6], "x": 6.4, "y": 5.125},
+
+                {"matrix": [10, 6], "x": 8.4, "y": 5.125},
+                {"matrix": [10, 5], "x": 9.45, "y": 4.625},
+                {"matrix": [10, 4], "x": 10.55, "y": 4.375},
+                {"matrix": [10, 3], "x": 11.55, "y": 4.375},
+                {"matrix": [10, 2], "x": 12.675, "y": 4.5},
+                {"matrix": [10, 1], "x": 13.8, "y": 4.375},
+                {"matrix": [10, 0], "x": 14.8, "y": 4.375},
+
+                {"matrix": [5, 1], "x": 1.125, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.125, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.125, "y": 5.5},
+
+                {"matrix": [11, 3], "x": 11.675, "y": 5.5},
+                {"matrix": [11, 2], "x": 12.675, "y": 5.5},
+                {"matrix": [11, 1], "x": 13.675, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
index e3d884bdb1b..ccfe99ad18f 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "rgblight": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index a496323b5d3..f90f3d9c07c 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
index 8712957dfaa..9b6b7a048f7 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
-
 SPLIT_KEYBOARD = no
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
index 49bb80ca31e..88b5b8b0ade 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
@@ -1,5 +1,4 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
 VIA_ENABLE = yes
-
 SPLIT_KEYBOARD = no
diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
index f0aa33b9625..da82c1a16c1 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
@@ -17,6 +17,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 033ade5a497..fd9a93f5030 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = no
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
index a8ba1431841..f5d53c001d4 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index e4bce8739b7..2210ae765c9 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
index a95f8d60fe0..2034b7d9ab4 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
@@ -14,6 +14,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index 70e97d797de..03a0fe22c08 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -13,6 +13,4 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no
 USE_I2C = no
 
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
deleted file mode 100644
index fad22122f6c..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "keyboard_name": "nknl7en",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEA56",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 21,
-        "split_count": [9, 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"
-    },
-    "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": [5, 0], "x": 6.75, "y": 0},
-                {"matrix": [5, 1], "x": 7.75, "y": 0},
-                {"matrix": [5, 2], "x": 8.75, "y": 0},
-                {"matrix": [5, 3], "x": 9.75, "y": 0},
-                {"matrix": [5, 4], "x": 10.75, "y": 0},
-                {"matrix": [5, 5], "x": 11.75, "y": 0},
-                {"matrix": [5, 6], "x": 12.75, "y": 0},
-                {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2},
-
-                {"matrix": [5, 8], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.25, "y": 1},
-                {"matrix": [6, 1], "x": 8.25, "y": 1},
-                {"matrix": [6, 2], "x": 9.25, "y": 1},
-                {"matrix": [6, 3], "x": 10.25, "y": 1},
-                {"matrix": [6, 4], "x": 11.25, "y": 1},
-                {"matrix": [6, 5], "x": 12.25, "y": 1},
-                {"matrix": [6, 6], "x": 13.25, "y": 1},
-                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
-
-                {"matrix": [6, 8], "x": 16.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": [7, 0], "x": 7.5, "y": 2},
-                {"matrix": [7, 1], "x": 8.5, "y": 2},
-                {"matrix": [7, 2], "x": 9.5, "y": 2},
-                {"matrix": [7, 3], "x": 10.5, "y": 2},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 12.5, "y": 2},
-                {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25},
-
-                {"matrix": [7, 8], "x": 16.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8, "y": 3},
-                {"matrix": [8, 1], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
-
-                {"matrix": [8, 6], "x": 15, "y": 3.25},
-
-                {"matrix": [8, 8], "x": 16.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2},
-                {"matrix": [4, 4], "x": 5.75, "y": 4},
-
-                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75},
-                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 12.75, "y": 4},
-
-                {"matrix": [9, 6], "x": 14, "y": 4.25},
-                {"matrix": [8, 7], "x": 15, "y": 4.25},
-                {"matrix": [9, 7], "x": 16, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/salicylic_acid3/nknl7en/keyboard.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json
new file mode 100644
index 00000000000..4d6b494b9fb
--- /dev/null
+++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "nknl7en",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA56",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 21,
+        "split_count": [9, 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"
+    },
+    "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": [5, 0], "x": 6.75, "y": 0},
+                {"matrix": [5, 1], "x": 7.75, "y": 0},
+                {"matrix": [5, 2], "x": 8.75, "y": 0},
+                {"matrix": [5, 3], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 5], "x": 11.75, "y": 0},
+                {"matrix": [5, 6], "x": 12.75, "y": 0},
+                {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2},
+
+                {"matrix": [5, 8], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.25, "y": 1},
+                {"matrix": [6, 1], "x": 8.25, "y": 1},
+                {"matrix": [6, 2], "x": 9.25, "y": 1},
+                {"matrix": [6, 3], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 5], "x": 12.25, "y": 1},
+                {"matrix": [6, 6], "x": 13.25, "y": 1},
+                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 16.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": [7, 0], "x": 7.5, "y": 2},
+                {"matrix": [7, 1], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [7, 3], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 5], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 8], "x": 16.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 15, "y": 3.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2},
+                {"matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75},
+                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 4},
+
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+                {"matrix": [8, 7], "x": 15, "y": 4.25},
+                {"matrix": [9, 7], "x": 16, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
deleted file mode 100644
index 7bafe46d9a0..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "keyboard_name": "nknl7jp",
-    "manufacturer": "Salicylic_Acid",
-    "url": "https://salicylic-acid3.hatenablog.com/",
-    "maintainer": "Salicylic_acid3",
-    "usb": {
-        "vid": "0x04D8",
-        "pid": "0xEA55",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "hue_steps": 10,
-        "led_count": 20,
-        "split_count": [9, 11],
-        "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",
-    "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": [5, 0], "x": 6.75, "y": 0},
-                {"matrix": [5, 1], "x": 7.75, "y": 0},
-                {"matrix": [5, 2], "x": 8.75, "y": 0},
-                {"matrix": [5, 3], "x": 9.75, "y": 0},
-                {"matrix": [5, 4], "x": 10.75, "y": 0},
-                {"matrix": [5, 5], "x": 11.75, "y": 0},
-                {"matrix": [5, 6], "x": 12.75, "y": 0},
-                {"matrix": [5, 7], "x": 13.75, "y": 0},
-                {"matrix": [5, 8], "x": 14.75, "y": 0},
-
-                {"matrix": [6, 8], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 7.25, "y": 1},
-                {"matrix": [6, 1], "x": 8.25, "y": 1},
-                {"matrix": [6, 2], "x": 9.25, "y": 1},
-                {"matrix": [6, 3], "x": 10.25, "y": 1},
-                {"matrix": [6, 4], "x": 11.25, "y": 1},
-                {"matrix": [6, 5], "x": 12.25, "y": 1},
-                {"matrix": [6, 6], "x": 13.25, "y": 1},
-                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [7, 8], "x": 16.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": [7, 0], "x": 7.5, "y": 2},
-                {"matrix": [7, 1], "x": 8.5, "y": 2},
-                {"matrix": [7, 2], "x": 9.5, "y": 2},
-                {"matrix": [7, 3], "x": 10.5, "y": 2},
-                {"matrix": [7, 4], "x": 11.5, "y": 2},
-                {"matrix": [7, 5], "x": 12.5, "y": 2},
-                {"matrix": [7, 6], "x": 13.5, "y": 2},
-
-                {"matrix": [7, 7], "x": 16.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 8, "y": 3},
-                {"matrix": [8, 1], "x": 9, "y": 3},
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3},
-                {"matrix": [8, 5], "x": 13, "y": 3},
-                {"matrix": [8, 6], "x": 14, "y": 3},
-
-                {"matrix": [8, 7], "x": 15.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4},
-
-                {"matrix": [9, 0], "x": 7.5, "y": 4},
-                {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75},
-                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
-
-                {"matrix": [9, 7], "x": 14.25, "y": 4.25},
-                {"matrix": [8, 8], "x": 15.25, "y": 4.25},
-                {"matrix": [9, 8], "x": 16.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/salicylic_acid3/nknl7jp/keyboard.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
new file mode 100644
index 00000000000..0f260cdfdd7
--- /dev/null
+++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "nknl7jp",
+    "manufacturer": "Salicylic_Acid",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "usb": {
+        "vid": "0x04D8",
+        "pid": "0xEA55",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "rgblight": {
+        "hue_steps": 10,
+        "led_count": 20,
+        "split_count": [9, 11],
+        "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",
+    "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": [5, 0], "x": 6.75, "y": 0},
+                {"matrix": [5, 1], "x": 7.75, "y": 0},
+                {"matrix": [5, 2], "x": 8.75, "y": 0},
+                {"matrix": [5, 3], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 5], "x": 11.75, "y": 0},
+                {"matrix": [5, 6], "x": 12.75, "y": 0},
+                {"matrix": [5, 7], "x": 13.75, "y": 0},
+                {"matrix": [5, 8], "x": 14.75, "y": 0},
+
+                {"matrix": [6, 8], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 7.25, "y": 1},
+                {"matrix": [6, 1], "x": 8.25, "y": 1},
+                {"matrix": [6, 2], "x": 9.25, "y": 1},
+                {"matrix": [6, 3], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 5], "x": 12.25, "y": 1},
+                {"matrix": [6, 6], "x": 13.25, "y": 1},
+                {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 8], "x": 16.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": [7, 0], "x": 7.5, "y": 2},
+                {"matrix": [7, 1], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [7, 3], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 5], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 13.5, "y": 2},
+
+                {"matrix": [7, 7], "x": 16.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 4},
+                {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75},
+                {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 7], "x": 14.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 15.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 16.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c
index e9910e01414..54be4195790 100644
--- a/keyboards/satt/comet46/lib/host_led_state_reader.c
+++ b/keyboards/satt/comet46/lib/host_led_state_reader.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "led.h"
+#include "host.h"
 
 char host_led_state_str[22];
 
diff --git a/keyboards/satt/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c
index c85c83b1dea..856b8d8a682 100644
--- a/keyboards/satt/comet46/lib/modifier_state_reader.c
+++ b/keyboards/satt/comet46/lib/modifier_state_reader.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "action_util.h"
 
 char modifier_state_str[22];
 
diff --git a/keyboards/satt/comet46/matrix.c b/keyboards/satt/comet46/matrix.c
index 9a69724eb78..15a29c5a865 100644
--- a/keyboards/satt/comet46/matrix.c
+++ b/keyboards/satt/comet46/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json
deleted file mode 100644
index 7c76e98f644..00000000000
--- a/keyboards/scatter42/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "keyboard_name": "scatter42",
-    "manufacturer": "bbrfkr",
-    "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
-    "maintainer": "bbrfkr",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3B47",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.5},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.25},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-
-                {"matrix": [4, 4], "x": 9, "y": 0.5},
-                {"matrix": [4, 3], "x": 10, "y": 0.25},
-                {"matrix": [4, 2], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0.25},
-                {"matrix": [4, 0], "x": 13, "y": 0.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-
-                {"matrix": [5, 4], "x": 9, "y": 1.5},
-                {"matrix": [5, 3], "x": 10, "y": 1.25},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 1], "x": 12, "y": 1.25},
-                {"matrix": [5, 0], "x": 13, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.25},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-
-                {"matrix": [6, 4], "x": 9, "y": 2.5},
-                {"matrix": [6, 3], "x": 10, "y": 2.25},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 1], "x": 12, "y": 2.25},
-                {"matrix": [6, 0], "x": 13, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.25},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3.5, "y": 3.625},
-                {"matrix": [3, 4], "x": 4.5, "y": 3.875},
-                {"matrix": [3, 5], "x": 5.5, "y": 4.125},
-
-                {"matrix": [7, 5], "x": 7.45, "y": 4.125},
-                {"matrix": [7, 4], "x": 8.45, "y": 3.875},
-                {"matrix": [7, 3], "x": 9.45, "y": 3.625},
-                {"matrix": [7, 2], "x": 11, "y": 3},
-                {"matrix": [7, 1], "x": 12, "y": 3.25},
-                {"matrix": [7, 0], "x": 13, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/scatter42/keyboard.json b/keyboards/scatter42/keyboard.json
new file mode 100644
index 00000000000..7ccf9cb9fcf
--- /dev/null
+++ b/keyboards/scatter42/keyboard.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "scatter42",
+    "manufacturer": "bbrfkr",
+    "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
+    "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x3B47",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+                {"matrix": [4, 4], "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "x": 10, "y": 0.25},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 1], "x": 12, "y": 0.25},
+                {"matrix": [4, 0], "x": 13, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [5, 4], "x": 9, "y": 1.5},
+                {"matrix": [5, 3], "x": 10, "y": 1.25},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 1], "x": 12, "y": 1.25},
+                {"matrix": [5, 0], "x": 13, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+                {"matrix": [6, 4], "x": 9, "y": 2.5},
+                {"matrix": [6, 3], "x": 10, "y": 2.25},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 1], "x": 12, "y": 2.25},
+                {"matrix": [6, 0], "x": 13, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.625},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.875},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.125},
+
+                {"matrix": [7, 5], "x": 7.45, "y": 4.125},
+                {"matrix": [7, 4], "x": 8.45, "y": 3.875},
+                {"matrix": [7, 3], "x": 9.45, "y": 3.625},
+                {"matrix": [7, 2], "x": 11, "y": 3},
+                {"matrix": [7, 1], "x": 12, "y": 3.25},
+                {"matrix": [7, 0], "x": 13, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk
deleted file mode 100644
index db5c82928c7..00000000000
--- a/keyboards/scatter42/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c
index d1c2d85ac83..9c474695a11 100644
--- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c
+++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c
@@ -15,8 +15,7 @@
  */
 
 #include "ec_switch_matrix.h"
-
-#include "quantum.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 #include "print.h"
 
diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json
index c213e1e26f8..833cd747895 100644
--- a/keyboards/sekigon/grs_70ec/info.json
+++ b/keyboards/sekigon/grs_70ec/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D3"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk
index 4bd93ef25bb..ac989e7ea83 100644
--- a/keyboards/sekigon/grs_70ec/rules.mk
+++ b/keyboards/sekigon/grs_70ec/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
-SPLIT_KEYBOARD = yes
 
 ANALOG_DRIVER_REQUIRED = yes
 
diff --git a/keyboards/senselessclay/had60/keymaps/default/keymap.c b/keyboards/senselessclay/had60/keymaps/default/keymap.c
index 5f9d5247660..9c70873acf1 100644
--- a/keyboards/senselessclay/had60/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/default/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT_all(
-        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, QK_BOOT, 
-		MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
+        GU_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, QK_BOOT, 
+		GU_ON,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/senselessclay/had60/keymaps/iso/keymap.c b/keyboards/senselessclay/had60/keymaps/iso/keymap.c
index 3c1323050ed..0324df5e87a 100644
--- a/keyboards/senselessclay/had60/keymaps/iso/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/iso/keymap.c
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT_all(
-        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
-		MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
+        GU_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
+		GU_ON,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/senselessclay/had60/keymaps/via/keymap.c b/keyboards/senselessclay/had60/keymaps/via/keymap.c
index ed21d8bad5a..11ec292b6c3 100644
--- a/keyboards/senselessclay/had60/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/had60/keymaps/via/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     [_2] = LAYOUT_all(
-        MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
-		MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
+        GU_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, 
+		GU_ON,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/config.h b/keyboards/sharkoon/skiller_sgk50_s2/config.h
new file mode 100644
index 00000000000..1d0f8f9a901
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/config.h
@@ -0,0 +1,13 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/halconf.h b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
new file mode 100644
index 00000000000..9d456a5106f
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/info.json
new file mode 100644
index 00000000000..39d59ffa55a
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/info.json
@@ -0,0 +1,515 @@
+{
+    "manufacturer": "Sharkoon Technologies GmbH",
+    "keyboard_name": "SKILLER SGK50 S2",
+    "maintainer": "JoyLee",
+    "bootloader": "wb32-dfu",
+    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "backing_size": 4096,
+            "driver": "spi_flash"
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C4", "C5", "B0"],
+        "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+    },
+    "processor": "WB32FQ95",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "val": 80
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [5, 6], "x": 75, "y": 64, "flags": 4},
+            {"matrix": [5, 10], "x": 124, "y": 64, "flags": 1},
+            {"matrix": [5, 11], "x": 137, "y": 64, "flags": 1},
+            {"matrix": [5, 12], "x": 149, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4},
+            {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4},
+            {"matrix": [5, 15], "x": 187, "y": 64, "flags": 4},
+            {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4},
+            {"matrix": [5, 17], "x": 212, "y": 64, "flags": 4},
+            {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4},
+            {"matrix": [4, 17], "x": 212, "y": 51, "flags": 4},
+            {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4},
+            {"matrix": [4, 15], "x": 187, "y": 51, "flags": 4},
+            {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4},
+            {"matrix": [4, 12], "x": 149, "y": 51, "flags": 4},
+            {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4},
+            {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4},
+            {"matrix": [4, 9], "x": 112, "y": 51, "flags": 4},
+            {"matrix": [4, 8], "x": 100, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4},
+            {"matrix": [4, 6], "x": 75, "y": 51, "flags": 4},
+            {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4},
+            {"matrix": [4, 4], "x": 50, "y": 51, "flags": 4},
+            {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4},
+            {"matrix": [4, 2], "x": 25, "y": 51, "flags": 4},
+            {"matrix": [3, 2], "x": 25, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 50, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 75, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 100, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 112, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4},
+            {"matrix": [3, 12], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 162, "y": 38, "flags": 4},
+            {"x": 162, "y": 38, "flags": 4},
+            {"matrix": [3, 15], "x": 187, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 212, "y": 38, "flags": 4},
+            {"matrix": [2, 18], "x": 224, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 212, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 199, "y": 26, "flags": 4},
+            {"matrix": [2, 15], "x": 187, "y": 26, "flags": 4},
+            {"x": 162, "y": 26, "flags": 4},
+            {"matrix": [3, 13], "x": 162, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 149, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 137, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 124, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 100, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 87, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 75, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 62, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 50, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 37, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 25, "y": 26, "flags": 4},
+            {"matrix": [2, 1], "x": 12, "y": 26, "flags": 4},
+            {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
+            {"matrix": [1, 2], "x": 25, "y": 13, "flags": 4},
+            {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 50, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
+            {"matrix": [1, 6], "x": 75, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
+            {"matrix": [1, 8], "x": 100, "y": 13, "flags": 4},
+            {"matrix": [1, 9], "x": 112, "y": 13, "flags": 4},
+            {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4},
+            {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4},
+            {"matrix": [1, 12], "x": 149, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4},
+            {"matrix": [1, 15], "x": 187, "y": 13, "flags": 4},
+            {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4},
+            {"matrix": [1, 17], "x": 212, "y": 13, "flags": 4},
+            {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4},
+            {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [0, 17], "x": 212, "y": 0, "flags": 4},
+            {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4},
+            {"matrix": [0, 15], "x": 187, "y": 0, "flags": 4},
+            {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 149, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 100, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 25, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4},
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 51, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 1},
+            {"matrix": [5, 1], "x": 12, "y": 64, "flags": 1},
+            {"matrix": [5, 2], "x": 25, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4}
+        ],
+        "max_brightness": 110,
+        "val_steps": 28,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3662",
+        "suspend_wakeup_delay": 1000,
+        "vid": "0x6332"
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "community_layouts": ["96_ansi", "96_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "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, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "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, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [0, 18], "x": 18, "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, "w": 2},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1},
+                {"matrix": [1, 17], "x": 17, "y": 1},
+                {"matrix": [1, 18], "x": 18, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2},
+                {"matrix": [2, 17], "x": 17, "y": 2},
+                {"matrix": [2, 18], "x": 18, "y": 2, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+                {"matrix": [3, 16], "x": 16, "y": 3},
+                {"matrix": [3, 17], "x": 17, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+                {"matrix": [4, 16], "x": 16, "y": 4},
+                {"matrix": [4, 17], "x": 17, "y": 4},
+                {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5},
+                {"matrix": [5, 16], "x": 16, "y": 5},
+                {"matrix": [5, 17], "x": 17, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..01e78f31240
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PAUS, KC_HOME, KC_END,    KC_PGUP,  KC_PGDN,  KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,    KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,     KC_P8,    KC_P9,    KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_P4,     KC_P5,    KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_P1,     KC_P2,    KC_P3,    KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,    KC_PDOT
+    ),
+
+    [1] = LAYOUT_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, RGB_SPD,  RGB_SPI,  _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..01e78f31240
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PAUS, KC_HOME, KC_END,    KC_PGUP,  KC_PGDN,  KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,    KC_PSLS,  KC_PAST,  KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,     KC_P8,    KC_P9,    KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_P4,     KC_P5,    KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_P1,     KC_P2,    KC_P3,    KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,    KC_PDOT
+    ),
+
+    [1] = LAYOUT_all(
+        EE_CLR,  KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE,  KC_VOLD, KC_VOLU, RGB_SPD,  RGB_SPI,  _______, _______, KC_PSCR, KC_SCRL, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______, _______, _______,          _______, RGB_VAI, _______, _______, _______, _______,
+        _______, GU_TOGG, _______,                             _______,                              _______, _______, _______, RGB_HUI, RGB_VAD, RGB_MOD, _______, _______
+    ),
+};
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h
new file mode 100644
index 00000000000..ae7ee58001a
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2024 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/sharkoon/skiller_sgk50_s2/readme.md b/keyboards/sharkoon/skiller_sgk50_s2/readme.md
new file mode 100644
index 00000000000..7be331eac5b
--- /dev/null
+++ b/keyboards/sharkoon/skiller_sgk50_s2/readme.md
@@ -0,0 +1,24 @@
+# SHARKOON SKILLER SGK50 S2
+
+![ISO](https://i.imgur.com/itgy5Bk.png)
+
+* Keyboard Maintainer: [JoyLee](https://github.com/itarze)
+* Hardware Supported: [SHARKOON SKILLER SGK50 S2 PCB](https://zh-hant.sharkoon.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sharkoon/skiller_sgk50_s2:default
+
+Flashing example for this keyboard:
+
+    make sharkoon/skiller_sgk50_s2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk
similarity index 100%
rename from keyboards/keaboard/rev1/rules.mk
rename to keyboards/sharkoon/skiller_sgk50_s2/rules.mk
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index fe45ad86c5c..e232fdba3e8 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -44,6 +44,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
index ed06e173de0..95e92dce2a4 100644
--- a/keyboards/silverbullet44/rules.mk
+++ b/keyboards/silverbullet44/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no
 AUDIO_ENABLE = yes          # Audio output
-SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c
index f65bf0f26a0..3fe3563c211 100644
--- a/keyboards/sirius/uni660/rev1/matrix.c
+++ b/keyboards/sirius/uni660/rev1/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c
index f65bf0f26a0..3fe3563c211 100644
--- a/keyboards/sirius/uni660/rev2/matrix.c
+++ b/keyboards/sirius/uni660/rev2/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp
index 07c6df29819..25648a5f78e 100644
--- a/keyboards/sirius/unigo66/custom_matrix.cpp
+++ b/keyboards/sirius/unigo66/custom_matrix.cpp
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
-extern "C" {
-#include "quantum.h"
-}
-
 /* KEY CODE to Matrix
  *
  * HID keycode(1 byte):
diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
index 191a1c0a1b5..a0b1795cee0 100755
--- a/keyboards/spaceholdings/nebula12/rules.mk
+++ b/keyboards/spaceholdings/nebula12/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 RGBLIGHT_ENABLE = yes              # Underglow RGB
 
 CIE1931_CURVE = yes
diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
index 627f82784eb..d2484b627c3 100755
--- a/keyboards/spaceholdings/nebula68/rules.mk
+++ b/keyboards/spaceholdings/nebula68/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 AUDIO_ENABLE = no                  # Audio output
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 RGBLIGHT_ENABLE = yes              # Underglow RGB
 
 CIE1931_CURVE = yes
diff --git a/keyboards/spaceholdings/nebula68b/hs/keyboard.json b/keyboards/spaceholdings/nebula68b/hs/keyboard.json
new file mode 100755
index 00000000000..ca41cff8e64
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/hs/keyboard.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "NEBULA68B HOTSWAP",
+    "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": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.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},
+                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c
new file mode 100755
index 00000000000..c42ca071f3f
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_68_ansi( /* Base */
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_68_ansi( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+    KC_VOLU, KC_VOLD, KC_MUTE,                   _______,                            _______, _______, _______,                   _______, _______, _______)
+};
diff --git a/keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/spaceholdings/nebula68b/hs/rules.mk b/keyboards/spaceholdings/nebula68b/hs/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
new file mode 100644
index 00000000000..3a7f6f9b25d
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/info.json
@@ -0,0 +1,82 @@
+{
+    "manufacturer": "Yiancar-Designs",
+    "url": "",
+    "maintainer": "yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x5338",
+        "device_version": "0.0.1"
+    },
+    "ws2812": {
+        "pin": "B7"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["D4", "D6", "D7", "B4", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/spaceholdings/nebula68b/keyboard.json b/keyboards/spaceholdings/nebula68b/keyboard.json
deleted file mode 100755
index 3be1f806391..00000000000
--- a/keyboards/spaceholdings/nebula68b/keyboard.json
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-    "keyboard_name": "NEBULA68B",
-    "manufacturer": "Yiancar-Designs",
-    "url": "",
-    "maintainer": "yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x5338",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "B7"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 130,
-        "sleep": true
-    },
-    "build": {
-        "lto": true
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["D4", "D6", "D7", "B4", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "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": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [2, 14], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [3, 14], "x": 16.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},
-                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 14.25, "y": 4},
-                {"matrix": [4, 13], "x": 15.25, "y": 4},
-                {"matrix": [4, 14], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [1, 13], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [2, 14], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [3, 14], "x": 16.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},
-                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 13], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 14.25, "y": 4},
-                {"matrix": [4, 13], "x": 15.25, "y": 4},
-                {"matrix": [4, 14], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
old mode 100755
new mode 100644
index 08c433bdb1a..c42ca071f3f
--- a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
+++ b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
@@ -16,17 +16,17 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_68_ansi_split_bs( /* Base */
-    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+[0] = LAYOUT_68_ansi( /* Base */
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
 
-[1] = LAYOUT_68_ansi_split_bs( /* FN */
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,
-    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
-    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS)
+[1] = LAYOUT_68_ansi( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+    KC_VOLU, KC_VOLD, KC_MUTE,                   _______,                            _______, _______, _______,                   _______, _______, _______)
 };
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
deleted file mode 100755
index a4a6c7facf7..00000000000
--- a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# The default keymap for Nebula68B. VIA support disabled.
-
-![Layer 0](https://i.imgur.com/dXyRwb1.png)
-
-![Layer 1](https://i.imgur.com/kxXnxVQ.png)
-
-Default layer is normal ANSI 68%
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
deleted file mode 100755
index 87727200f43..00000000000
--- a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_68_ansi_split_bs( /* Base */
-    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
-
-[1] = LAYOUT_68_ansi_split_bs( /* FN */
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,
-    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
-    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
-
-[3] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS)
-};
diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
deleted file mode 100755
index 583ddc02cf8..00000000000
--- a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# The default keymap for Nebula68B. VIA support enabled.
-
-![Layer 0](https://i.imgur.com/dXyRwb1.png)
-
-![Layer 1](https://i.imgur.com/kxXnxVQ.png)
-
-Default layer is normal ANSI 68%
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
deleted file mode 100755
index b99777ff5be..00000000000
--- a/keyboards/spaceholdings/nebula68b/nebula68b.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifndef KEYBOARD_spaceholdings_nebula68b_hs
-#ifdef RGB_MATRIX_ENABLE
-// clang-format off
-led_config_t g_led_config = { {
-    {  0,      1,  2,      4,      5,      6,  7,      9,     10, 11, 13, 14, 15, 18, 19 },
-    { 36,     35, 34,     33,     32,     31, 30,     29,     28, 27, 26, 25, 24, 16, 22 },
-    { 38,     39, 40,     41,     42,     43, 44,     45,     46, 47, 48, 49, 23, 50, 20 },
-    { 64, NO_LED, 63,     62,     61,     60, 59,     58,     57, 56, 55, 54, 53, 52, 21 },
-    { 65,     66, 68, NO_LED, NO_LED, NO_LED, 70, NO_LED, NO_LED, 72, 73, 74, 76, 77, 78 }
-}, {
-    {  6, 10}, { 19, 10}, { 32, 10}, { 44, 13}, { 45, 10}, { 58, 10}, { 71, 10}, { 84, 10}, { 88, 13}, { 97, 10}, {110, 10}, {123, 10}, {132, 13}, {136, 10}, {149, 10}, {162, 10},
-    {175, 10}, {179, 13}, {188, 10}, {205, 10}, {218, 10}, {218, 23}, {205, 23}, {185, 23}, {169, 23}, {156, 23}, {143, 23}, {130, 23}, {117, 23}, {104, 23}, { 91, 23}, { 78, 23},
-    { 65, 23}, { 52, 23}, { 39, 23}, { 26, 23}, { 10, 23}, {  4, 26}, { 11, 35}, { 29, 35}, { 42, 35}, { 55, 35}, { 68, 35}, { 81, 35}, { 94, 35}, {107, 35}, {120, 35}, {133, 35},
-    {146, 35}, {159, 35}, {180, 35}, {220, 32}, {205, 48}, {177, 48}, {153, 48}, {140, 48}, {127, 48}, {114, 48}, {101, 48}, { 88, 48}, { 75, 48}, { 62, 48}, { 49, 48}, { 36, 48},
-    { 15, 48}, {  8, 61}, { 24, 61}, { 32, 52}, { 41, 61}, { 82, 56}, { 89, 61}, {132, 53}, {138, 61}, {154, 61}, {170, 61}, {179, 53}, {192, 61}, {205, 61}, {218, 61}
-}, {
-    1, 4, 4, 2, 4, 4, 4, 4, 2, 4, 4, 4, 2, 4, 4, 4, 4, 2, 1, 1, 1,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 2, 1, 2, 4, 2, 1, 1, 1, 2, 1, 1, 1
-} };
-// clang-format on
-#endif
-#endif
diff --git a/keyboards/spaceholdings/nebula68b/readme.md b/keyboards/spaceholdings/nebula68b/readme.md
index 4c238e2ea0a..6ff3bc2b913 100755
--- a/keyboards/spaceholdings/nebula68b/readme.md
+++ b/keyboards/spaceholdings/nebula68b/readme.md
@@ -12,7 +12,9 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u
 
 Make example for this keyboard (after setting up your build environment):
 
-    make spaceholdings/nebula68b:via
+    make spaceholdings/nebula68b/hs:via
+    make spaceholdings/nebula68b/solder:via
+
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
new file mode 100644
index 00000000000..8fe37f83b32
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = spaceholdings/nebula68b/solder
diff --git a/keyboards/spaceholdings/nebula68b/solder/keyboard.json b/keyboards/spaceholdings/nebula68b/solder/keyboard.json
new file mode 100755
index 00000000000..3a50385fe33
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/solder/keyboard.json
@@ -0,0 +1,167 @@
+{
+    "keyboard_name": "NEBULA68B SOLDER",
+    "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": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.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},
+                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 13], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [3, 14], "x": 16.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},
+                {"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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c
new file mode 100755
index 00000000000..68fe5d22fd4
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_68_ansi_split_bs( /* Base */
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_68_ansi_split_bs( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+    KC_VOLU, KC_VOLD, KC_MUTE,                   _______,                            _______, _______, _______,                   _______, _______, _______)
+};
diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c
new file mode 100755
index 00000000000..68fe5d22fd4
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_68_ansi_split_bs( /* Base */
+    QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, KC_BSPC,  KC_INS,  KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_68_ansi_split_bs( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+    KC_VOLU, KC_VOLD, KC_MUTE,                   _______,                            _______, _______, _______,                   _______, _______, _______)
+};
diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/spaceholdings/nebula68b/solder/solder.c b/keyboards/spaceholdings/nebula68b/solder/solder.c
new file mode 100755
index 00000000000..352cee1d52b
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/solder/solder.c
@@ -0,0 +1,41 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  0,      1,  2,      4,      5,      6,  7,      9,     10, 11, 13, 14, 15, 18, 19 },
+    { 36,     35, 34,     33,     32,     31, 30,     29,     28, 27, 26, 25, 24, 16, 22 },
+    { 38,     39, 40,     41,     42,     43, 44,     45,     46, 47, 48, 49, 23, 50, 20 },
+    { 64, NO_LED, 63,     62,     61,     60, 59,     58,     57, 56, 55, 54, 53, 52, 21 },
+    { 65,     66, 68, NO_LED, NO_LED, NO_LED, 70, NO_LED, NO_LED, 72, 73, 74, 76, 77, 78 }
+}, {
+    {  6, 10}, { 19, 10}, { 32, 10}, { 44, 13}, { 45, 10}, { 58, 10}, { 71, 10}, { 84, 10}, { 88, 13}, { 97, 10}, {110, 10}, {123, 10}, {132, 13}, {136, 10}, {149, 10}, {162, 10},
+    {175, 10}, {179, 13}, {188, 10}, {205, 10}, {218, 10}, {218, 23}, {205, 23}, {185, 23}, {169, 23}, {156, 23}, {143, 23}, {130, 23}, {117, 23}, {104, 23}, { 91, 23}, { 78, 23},
+    { 65, 23}, { 52, 23}, { 39, 23}, { 26, 23}, { 10, 23}, {  4, 26}, { 11, 35}, { 29, 35}, { 42, 35}, { 55, 35}, { 68, 35}, { 81, 35}, { 94, 35}, {107, 35}, {120, 35}, {133, 35},
+    {146, 35}, {159, 35}, {180, 35}, {220, 32}, {205, 48}, {177, 48}, {153, 48}, {140, 48}, {127, 48}, {114, 48}, {101, 48}, { 88, 48}, { 75, 48}, { 62, 48}, { 49, 48}, { 36, 48},
+    { 15, 48}, {  8, 61}, { 24, 61}, { 32, 52}, { 41, 61}, { 82, 56}, { 89, 61}, {132, 53}, {138, 61}, {154, 61}, {170, 61}, {179, 53}, {192, 61}, {205, 61}, {218, 61}
+}, {
+    1, 4, 4, 2, 4, 4, 4, 4, 2, 4, 4, 4, 2, 4, 4, 4, 4, 2, 1, 1, 1,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 2, 1, 2, 4, 2, 1, 1, 1, 2, 1, 1, 1
+} };
+// clang-format on
+#endif
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
deleted file mode 100644
index b7ece10f6c7..00000000000
--- a/keyboards/spacetime/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Kyle Terry
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json
index a55223b653a..1e04608349b 100644
--- a/keyboards/spacetime/info.json
+++ b/keyboards/spacetime/info.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
     "rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/spacetime/rev1/keyboard.json b/keyboards/spacetime/rev1/keyboard.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/keyboards/spacetime/rev1/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/spacetime/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
deleted file mode 100644
index f15b7696494..00000000000
--- a/keyboards/sparrow62/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "keyboard_name": "sparrow62",
-    "manufacturer": "Atsushi_Morimoto_74th",
-    "url": "https://github.com/74th/sparrow62-buildguide",
-    "maintainer": "Atsushi Morimoto (@74th)",
-    "usb": {
-        "vid": "0xDA74",
-        "pid": "0x7461",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 6], "x": 0, "y": 0.5},
-                {"matrix": [0, 5], "x": 1, "y": 0.38},
-                {"matrix": [0, 4], "x": 2, "y": 0.13},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0.13},
-                {"matrix": [0, 1], "x": 5, "y": 0.25},
-
-                {"matrix": [5, 1], "x": 9, "y": 0.25},
-                {"matrix": [5, 2], "x": 10, "y": 0.13},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "y": 0.13},
-                {"matrix": [5, 5], "x": 13, "y": 0.38},
-                {"matrix": [5, 6], "x": 14, "y": 0.5},
-
-                {"matrix": [1, 6], "x": 0, "y": 1.5},
-                {"matrix": [1, 5], "x": 1, "y": 1.38},
-                {"matrix": [1, 4], "x": 2, "y": 1.13},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 2], "x": 4, "y": 1.13},
-                {"matrix": [1, 1], "x": 5, "y": 1.25},
-                {"matrix": [0, 0], "x": 6, "y": 0.75},
-
-                {"matrix": [5, 0], "x": 8, "y": 0.75},
-                {"matrix": [6, 1], "x": 9, "y": 1.25},
-                {"matrix": [6, 2], "x": 10, "y": 1.13},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "y": 1.13},
-                {"matrix": [6, 5], "x": 13, "y": 1.38},
-                {"matrix": [6, 6], "x": 14, "y": 1.5},
-
-                {"matrix": [2, 6], "x": 0, "y": 2.5},
-                {"matrix": [2, 5], "x": 1, "y": 2.38},
-                {"matrix": [2, 4], "x": 2, "y": 2.13},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2.13},
-                {"matrix": [2, 1], "x": 5, "y": 2.25},
-                {"matrix": [1, 0], "x": 6, "y": 1.75},
-
-                {"matrix": [6, 0], "x": 8, "y": 1.75},
-                {"matrix": [7, 1], "x": 9, "y": 2.25},
-                {"matrix": [7, 2], "x": 10, "y": 2.13},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2.13},
-                {"matrix": [7, 5], "x": 13, "y": 2.38},
-                {"matrix": [7, 6], "x": 14, "y": 2.5},
-
-                {"matrix": [3, 6], "x": 0, "y": 3.5},
-                {"matrix": [3, 5], "x": 1, "y": 3.38},
-                {"matrix": [3, 4], "x": 2, "y": 3.13},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 2], "x": 4, "y": 3.13},
-                {"matrix": [3, 1], "x": 5, "y": 3.25},
-                {"matrix": [2, 0], "x": 6, "y": 2.75},
-
-                {"matrix": [7, 0], "x": 8, "y": 2.75},
-                {"matrix": [8, 1], "x": 9, "y": 3.25},
-                {"matrix": [8, 2], "x": 10, "y": 3.13},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-                {"matrix": [8, 4], "x": 12, "y": 3.13},
-                {"matrix": [8, 5], "x": 13, "y": 3.38},
-                {"matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"matrix": [4, 3], "x": 2.5, "y": 4.13},
-                {"matrix": [4, 2], "x": 3.5, "y": 4.13},
-                {"matrix": [4, 1], "x": 4.5, "y": 4.25},
-                {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25},
-
-                {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25},
-                {"matrix": [9, 1], "x": 9.5, "y": 4.25},
-                {"matrix": [9, 2], "x": 10.5, "y": 4.13},
-                {"matrix": [9, 3], "x": 11.5, "y": 4.13}
-            ]
-        }
-    }
-}
diff --git a/keyboards/sparrow62/keyboard.json b/keyboards/sparrow62/keyboard.json
new file mode 100644
index 00000000000..e551bb48517
--- /dev/null
+++ b/keyboards/sparrow62/keyboard.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "sparrow62",
+    "manufacturer": "Atsushi_Morimoto_74th",
+    "url": "https://github.com/74th/sparrow62-buildguide",
+    "maintainer": "Atsushi Morimoto (@74th)",
+    "usb": {
+        "vid": "0xDA74",
+        "pid": "0x7461",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0.5},
+                {"matrix": [0, 5], "x": 1, "y": 0.38},
+                {"matrix": [0, 4], "x": 2, "y": 0.13},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0.13},
+                {"matrix": [0, 1], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 1], "x": 9, "y": 0.25},
+                {"matrix": [5, 2], "x": 10, "y": 0.13},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.13},
+                {"matrix": [5, 5], "x": 13, "y": 0.38},
+                {"matrix": [5, 6], "x": 14, "y": 0.5},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.5},
+                {"matrix": [1, 5], "x": 1, "y": 1.38},
+                {"matrix": [1, 4], "x": 2, "y": 1.13},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1.13},
+                {"matrix": [1, 1], "x": 5, "y": 1.25},
+                {"matrix": [0, 0], "x": 6, "y": 0.75},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.75},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.13},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.13},
+                {"matrix": [6, 5], "x": 13, "y": 1.38},
+                {"matrix": [6, 6], "x": 14, "y": 1.5},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.5},
+                {"matrix": [2, 5], "x": 1, "y": 2.38},
+                {"matrix": [2, 4], "x": 2, "y": 2.13},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2.13},
+                {"matrix": [2, 1], "x": 5, "y": 2.25},
+                {"matrix": [1, 0], "x": 6, "y": 1.75},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.75},
+                {"matrix": [7, 1], "x": 9, "y": 2.25},
+                {"matrix": [7, 2], "x": 10, "y": 2.13},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.13},
+                {"matrix": [7, 5], "x": 13, "y": 2.38},
+                {"matrix": [7, 6], "x": 14, "y": 2.5},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.5},
+                {"matrix": [3, 5], "x": 1, "y": 3.38},
+                {"matrix": [3, 4], "x": 2, "y": 3.13},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3.13},
+                {"matrix": [3, 1], "x": 5, "y": 3.25},
+                {"matrix": [2, 0], "x": 6, "y": 2.75},
+
+                {"matrix": [7, 0], "x": 8, "y": 2.75},
+                {"matrix": [8, 1], "x": 9, "y": 3.25},
+                {"matrix": [8, 2], "x": 10, "y": 3.13},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3.13},
+                {"matrix": [8, 5], "x": 13, "y": 3.38},
+                {"matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 3], "x": 2.5, "y": 4.13},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.13},
+                {"matrix": [4, 1], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25},
+
+                {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.13},
+                {"matrix": [9, 3], "x": 11.5, "y": 4.13}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/sparrow62/rules.mk
+++ /dev/null
@@ -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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/spiderisland/split78/matrix.c b/keyboards/spiderisland/split78/matrix.c
index 31ee29eaab6..23b37453517 100644
--- a/keyboards/spiderisland/split78/matrix.c
+++ b/keyboards/spiderisland/split78/matrix.c
@@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string.h>
-#include <stdio.h>
-#include "quantum.h"
+#include "matrix.h"
 #include "i2c_master.h"
 
 #define RIGHT_HALF
diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json
deleted file mode 100644
index 06e9c6a099f..00000000000
--- a/keyboards/splitty/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "keyboard_name": "Splitty",
-  "manufacturer": "Nicolas Schodet",
-  "url": "https://git.ni.fr.eu.org/splitty.git/about/",
-  "maintainer": "schodet",
-  "usb": {
-    "vid": "0x1D50",
-    "pid": "0x6052",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
-    "rows": ["F0", "F1", "D4", "D5", "D6"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0.6667},
-        {"matrix": [0, 1], "x": 1, "y": 0.6667},
-        {"matrix": [0, 2], "x": 2, "y": 0.2667},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0.2667},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-
-        {"matrix": [5, 6], "x": 10, "y": 0},
-        {"matrix": [5, 5], "x": 11, "y": 0},
-        {"matrix": [5, 4], "x": 12, "y": 0.2667},
-        {"matrix": [5, 3], "x": 13, "y": 0},
-        {"matrix": [5, 2], "x": 14, "y": 0.2667},
-        {"matrix": [5, 1], "x": 15, "y": 0.6667},
-        {"matrix": [5, 0], "x": 16, "y": 0.6667},
-
-        {"matrix": [1, 0], "x": 0, "y": 1.6667},
-        {"matrix": [1, 1], "x": 1, "y": 1.6667},
-        {"matrix": [1, 2], "x": 2, "y": 1.2667},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1.2667},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5},
-
-        {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5},
-        {"matrix": [6, 5], "x": 11, "y": 1},
-        {"matrix": [6, 4], "x": 12, "y": 1.2667},
-        {"matrix": [6, 3], "x": 13, "y": 1},
-        {"matrix": [6, 2], "x": 14, "y": 1.2667},
-        {"matrix": [6, 1], "x": 15, "y": 1.6667},
-        {"matrix": [6, 0], "x": 16, "y": 1.6667},
-
-        {"matrix": [2, 0], "x": 0, "y": 2.6667},
-        {"matrix": [2, 1], "x": 1, "y": 2.6667},
-        {"matrix": [2, 2], "x": 2, "y": 2.2667},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2.2667},
-        {"matrix": [2, 5], "x": 5, "y": 2},
-
-        {"matrix": [7, 5], "x": 11, "y": 2},
-        {"matrix": [7, 4], "x": 12, "y": 2.2667},
-        {"matrix": [7, 3], "x": 13, "y": 2},
-        {"matrix": [7, 2], "x": 14, "y": 2.2667},
-        {"matrix": [7, 1], "x": 15, "y": 2.6667},
-        {"matrix": [7, 0], "x": 16, "y": 2.6667},
-
-        {"matrix": [3, 0], "x": 0, "y": 3.6667},
-        {"matrix": [3, 1], "x": 1, "y": 3.6667},
-        {"matrix": [3, 2], "x": 2, "y": 3.2667},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3.2667},
-        {"matrix": [3, 5], "x": 5, "y": 3},
-        {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5},
-
-        {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5},
-        {"matrix": [8, 5], "x": 11, "y": 3},
-        {"matrix": [8, 4], "x": 12, "y": 3.2667},
-        {"matrix": [8, 3], "x": 13, "y": 3},
-        {"matrix": [8, 2], "x": 14, "y": 3.2667},
-        {"matrix": [8, 1], "x": 15, "y": 3.6667},
-        {"matrix": [8, 0], "x": 16, "y": 3.6667},
-
-        {"matrix": [4, 2], "x": 2, "y": 4.2667},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4.2667},
-        {"matrix": [4, 5], "x": 5, "y": 4},
-        {"matrix": [4, 6], "x": 6, "y": 4},
-
-        {"matrix": [9, 6], "x": 10, "y": 4},
-        {"matrix": [9, 5], "x": 11, "y": 4},
-        {"matrix": [9, 4], "x": 12, "y": 4.2667},
-        {"matrix": [9, 3], "x": 13, "y": 4},
-        {"matrix": [9, 2], "x": 14, "y": 4.2667}
-      ]
-    }
-  }
-}
diff --git a/keyboards/splitty/config.h b/keyboards/splitty/rev1/config.h
similarity index 100%
rename from keyboards/splitty/config.h
rename to keyboards/splitty/rev1/config.h
diff --git a/keyboards/splitty/rev1/keyboard.json b/keyboards/splitty/rev1/keyboard.json
new file mode 100644
index 00000000000..d820993dbc5
--- /dev/null
+++ b/keyboards/splitty/rev1/keyboard.json
@@ -0,0 +1,104 @@
+{
+  "keyboard_name": "Splitty",
+  "manufacturer": "Nicolas Schodet",
+  "url": "https://git.ni.fr.eu.org/splitty.git/about/",
+  "maintainer": "schodet",
+  "usb": {
+    "vid": "0x1D50",
+    "pid": "0x6052",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "mousekey": true,
+    "extrakey": true
+  },
+  "split": {
+    "enabled": true
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
+    "rows": ["F0", "F1", "D4", "D5", "D6"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.6667},
+        {"matrix": [0, 1], "x": 1, "y": 0.6667},
+        {"matrix": [0, 2], "x": 2, "y": 0.2667},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.2667},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 6], "x": 10, "y": 0},
+        {"matrix": [5, 5], "x": 11, "y": 0},
+        {"matrix": [5, 4], "x": 12, "y": 0.2667},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 2], "x": 14, "y": 0.2667},
+        {"matrix": [5, 1], "x": 15, "y": 0.6667},
+        {"matrix": [5, 0], "x": 16, "y": 0.6667},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.6667},
+        {"matrix": [1, 1], "x": 1, "y": 1.6667},
+        {"matrix": [1, 2], "x": 2, "y": 1.2667},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.2667},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5},
+
+        {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5},
+        {"matrix": [6, 5], "x": 11, "y": 1},
+        {"matrix": [6, 4], "x": 12, "y": 1.2667},
+        {"matrix": [6, 3], "x": 13, "y": 1},
+        {"matrix": [6, 2], "x": 14, "y": 1.2667},
+        {"matrix": [6, 1], "x": 15, "y": 1.6667},
+        {"matrix": [6, 0], "x": 16, "y": 1.6667},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.6667},
+        {"matrix": [2, 1], "x": 1, "y": 2.6667},
+        {"matrix": [2, 2], "x": 2, "y": 2.2667},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.2667},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+
+        {"matrix": [7, 5], "x": 11, "y": 2},
+        {"matrix": [7, 4], "x": 12, "y": 2.2667},
+        {"matrix": [7, 3], "x": 13, "y": 2},
+        {"matrix": [7, 2], "x": 14, "y": 2.2667},
+        {"matrix": [7, 1], "x": 15, "y": 2.6667},
+        {"matrix": [7, 0], "x": 16, "y": 2.6667},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.6667},
+        {"matrix": [3, 1], "x": 1, "y": 3.6667},
+        {"matrix": [3, 2], "x": 2, "y": 3.2667},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.2667},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5},
+
+        {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5},
+        {"matrix": [8, 5], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3.2667},
+        {"matrix": [8, 3], "x": 13, "y": 3},
+        {"matrix": [8, 2], "x": 14, "y": 3.2667},
+        {"matrix": [8, 1], "x": 15, "y": 3.6667},
+        {"matrix": [8, 0], "x": 16, "y": 3.6667},
+
+        {"matrix": [4, 2], "x": 2, "y": 4.2667},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4.2667},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+
+        {"matrix": [9, 6], "x": 10, "y": 4},
+        {"matrix": [9, 5], "x": 11, "y": 4},
+        {"matrix": [9, 4], "x": 12, "y": 4.2667},
+        {"matrix": [9, 3], "x": 13, "y": 4},
+        {"matrix": [9, 2], "x": 14, "y": 4.2667}
+      ]
+    }
+  }
+}
diff --git a/keyboards/splitty/rev1/rules.mk b/keyboards/splitty/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk
index 2389937b0b8..68b3198bfba 100644
--- a/keyboards/splitty/rules.mk
+++ b/keyboards/splitty/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-
 DEFAULT_FOLDER = splitty/rev1
diff --git a/keyboards/sthlmkb/lagom/matrix.c b/keyboards/sthlmkb/lagom/matrix.c
index d3dc0cb12aa..6a16722ad08 100644
--- a/keyboards/sthlmkb/lagom/matrix.c
+++ b/keyboards/sthlmkb/lagom/matrix.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "matrix.h"
+#include "wait.h"
 
 #define COL_SHIFTER ((uint32_t)1)
 
diff --git a/keyboards/stront/keymaps/hid/hid_display.h b/keyboards/stront/keymaps/hid/hid_display.h
index b93bf647169..e823d3e8a4c 100644
--- a/keyboards/stront/keymaps/hid/hid_display.h
+++ b/keyboards/stront/keymaps/hid/hid_display.h
@@ -1,7 +1,8 @@
 // Copyright 2023 zzeneg (@zzeneg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 typedef enum {
     _QWERTY = 0,
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json
index 4c6bd2d1da3..6748321ff37 100644
--- a/keyboards/supersplit/info.json
+++ b/keyboards/supersplit/info.json
@@ -24,6 +24,7 @@
         "vid": "0xFEED"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "layouts": {
diff --git a/keyboards/supersplit/rules.mk b/keyboards/supersplit/rules.mk
index 65e2c2165eb..a4f16a0b6be 100644
--- a/keyboards/supersplit/rules.mk
+++ b/keyboards/supersplit/rules.mk
@@ -1,4 +1 @@
-# This file intentionally left blank
-SPLIT_KEYBOARD = yes
-
 SERIAL_DRIVER = bitbang
diff --git a/keyboards/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c
index a7008e9c7d0..059934bf441 100644
--- a/keyboards/switchplate/southpaw_65/matrix.c
+++ b/keyboards/switchplate/southpaw_65/matrix.c
@@ -13,15 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <string.h>
 #include "matrix.h"
 #include "pca9555.h"
-#include "quantum.h"
-
-#include "debug.h"
 
 // PCA9555 slave addresses
 #define IC1 0x20
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
index ba90f9fdd7d..08dcbfee54b 100644
--- a/keyboards/takashicompany/compacx/info.json
+++ b/keyboards/takashicompany/compacx/info.json
@@ -42,6 +42,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",
diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk
index 8e0e5ffd1ab..25fcdc1a34c 100644
--- a/keyboards/takashicompany/compacx/rules.mk
+++ b/keyboards/takashicompany/compacx/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD=yes
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
index a7b470ce880..767f787e5e3 100644
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ b/keyboards/takashiski/hecomi/alpha/info.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D1"
   },
   "rgblight": {
diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
index adea9f5950d..98c2f6b6a7f 100644
--- a/keyboards/takashiski/hecomi/alpha/rules.mk
+++ b/keyboards/takashiski/hecomi/alpha/rules.mk
@@ -10,4 +10,3 @@ 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
deleted file mode 100644
index 2c65d48a3cd..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "keyboard_name": "otaku split rev.0",
-    "manufacturer": "takashiski",
-    "url": "",
-    "maintainer": "takashiski",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-        "rows": ["B5", "B4", "E6", "D7", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 9.75, "y": 0},
-                {"matrix": [5, 1], "x": 10.75, "y": 0},
-                {"matrix": [5, 2], "x": 11.75, "y": 0},
-                {"matrix": [5, 3], "x": 12.75, "y": 0},
-                {"matrix": [5, 4], "x": 13.75, "y": 0},
-                {"matrix": [5, 5], "x": 14.75, "y": 0},
-                {"matrix": [5, 6], "x": 15.75, "y": 0},
-                {"matrix": [5, 7], "x": 16.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [6, 1], "x": 10.25, "y": 1},
-                {"matrix": [6, 2], "x": 11.25, "y": 1},
-                {"matrix": [6, 3], "x": 12.25, "y": 1},
-                {"matrix": [6, 4], "x": 13.25, "y": 1},
-                {"matrix": [6, 5], "x": 14.25, "y": 1},
-                {"matrix": [6, 6], "x": 15.25, "y": 1},
-                {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
-
-                {"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": [7, 0], "x": 9.5, "y": 2},
-                {"matrix": [7, 1], "x": 10.5, "y": 2},
-                {"matrix": [7, 2], "x": 11.5, "y": 2},
-                {"matrix": [7, 3], "x": 12.5, "y": 2},
-                {"matrix": [7, 4], "x": 13.5, "y": 2},
-                {"matrix": [7, 5], "x": 14.5, "y": 2},
-                {"matrix": [7, 6], "x": 15.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 9, "y": 3},
-                {"matrix": [8, 1], "x": 10, "y": 3},
-                {"matrix": [8, 2], "x": 11, "y": 3},
-                {"matrix": [8, 3], "x": 12, "y": 3},
-                {"matrix": [8, 4], "x": 13, "y": 3},
-                {"matrix": [8, 5], "x": 14, "y": 3},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
-                {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 4.5, "y": 4},
-                {"matrix": [4, 4], "x": 5.5, "y": 4},
-                {"matrix": [4, 5], "x": 6.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 8.75, "y": 4},
-                {"matrix": [9, 1], "x": 9.75, "y": 4},
-                {"matrix": [9, 2], "x": 10.75, "y": 4},
-                {"matrix": [9, 3], "x": 11.75, "y": 4},
-                {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json
new file mode 100644
index 00000000000..db577c22606
--- /dev/null
+++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "otaku split rev.0",
+    "manufacturer": "takashiski",
+    "url": "",
+    "maintainer": "takashiski",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 9.75, "y": 0},
+                {"matrix": [5, 1], "x": 10.75, "y": 0},
+                {"matrix": [5, 2], "x": 11.75, "y": 0},
+                {"matrix": [5, 3], "x": 12.75, "y": 0},
+                {"matrix": [5, 4], "x": 13.75, "y": 0},
+                {"matrix": [5, 5], "x": 14.75, "y": 0},
+                {"matrix": [5, 6], "x": 15.75, "y": 0},
+                {"matrix": [5, 7], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [6, 1], "x": 10.25, "y": 1},
+                {"matrix": [6, 2], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 4], "x": 13.25, "y": 1},
+                {"matrix": [6, 5], "x": 14.25, "y": 1},
+                {"matrix": [6, 6], "x": 15.25, "y": 1},
+                {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 0], "x": 9.5, "y": 2},
+                {"matrix": [7, 1], "x": 10.5, "y": 2},
+                {"matrix": [7, 2], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 4], "x": 13.5, "y": 2},
+                {"matrix": [7, 5], "x": 14.5, "y": 2},
+                {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 4], "x": 13, "y": 3},
+                {"matrix": [8, 5], "x": 14, "y": 3},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4},
+                {"matrix": [4, 4], "x": 5.5, "y": 4},
+                {"matrix": [4, 5], "x": 6.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.75, "y": 4},
+                {"matrix": [9, 1], "x": 9.75, "y": 4},
+                {"matrix": [9, 2], "x": 10.75, "y": 4},
+                {"matrix": [9, 3], "x": 11.75, "y": 4},
+                {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk
deleted file mode 100644
index d43bca5db2a..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD=yes
diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
deleted file mode 100644
index 2c15c414e11..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "keyboard_name": "otaku split rev.1",
-    "manufacturer": "takashiski",
-    "url": "http",
-    "maintainer": "takashiski",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D0",
-        "matrix_pins": {
-            "right": {
-                "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-                "rows": ["B5", "B4", "E6", "D7", "C6"]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [5, 0], "x": 8.75, "y": 0},
-                {"matrix": [5, 1], "x": 9.75, "y": 0},
-                {"matrix": [5, 2], "x": 10.75, "y": 0},
-                {"matrix": [5, 3], "x": 11.75, "y": 0},
-                {"matrix": [5, 4], "x": 12.75, "y": 0},
-                {"matrix": [5, 5], "x": 13.75, "y": 0},
-                {"matrix": [5, 6], "x": 14.75, "y": 0},
-                {"matrix": [5, 7], "x": 15.75, "y": 0},
-                {"matrix": [6, 7], "x": 16.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-
-                {"matrix": [6, 0], "x": 9.25, "y": 1},
-                {"matrix": [6, 1], "x": 10.25, "y": 1},
-                {"matrix": [6, 2], "x": 11.25, "y": 1},
-                {"matrix": [6, 3], "x": 12.25, "y": 1},
-                {"matrix": [6, 4], "x": 13.25, "y": 1},
-                {"matrix": [6, 5], "x": 14.25, "y": 1},
-                {"matrix": [6, 6], "x": 15.25, "y": 1},
-                {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
-
-                {"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": [7, 0], "x": 9.5, "y": 2},
-                {"matrix": [7, 1], "x": 10.5, "y": 2},
-                {"matrix": [7, 2], "x": 11.5, "y": 2},
-                {"matrix": [7, 3], "x": 12.5, "y": 2},
-                {"matrix": [7, 4], "x": 13.5, "y": 2},
-                {"matrix": [7, 5], "x": 14.5, "y": 2},
-                {"matrix": [7, 6], "x": 15.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [8, 0], "x": 9, "y": 3},
-                {"matrix": [8, 1], "x": 10, "y": 3},
-                {"matrix": [8, 2], "x": 11, "y": 3},
-                {"matrix": [8, 3], "x": 12, "y": 3},
-                {"matrix": [8, 4], "x": 13, "y": 3},
-                {"matrix": [8, 5], "x": 14, "y": 3},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4},
-                {"matrix": [4, 5], "x": 5.5, "y": 4},
-                {"matrix": [4, 6], "x": 6.5, "y": 4},
-
-                {"matrix": [9, 0], "x": 8.75, "y": 4},
-                {"matrix": [9, 1], "x": 9.75, "y": 4},
-                {"matrix": [9, 2], "x": 10.75, "y": 4},
-                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
-                {"matrix": [9, 6], "x": 15.5, "y": 4},
-                {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json
new file mode 100644
index 00000000000..0c83593eea6
--- /dev/null
+++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "otaku split rev.1",
+    "manufacturer": "takashiski",
+    "url": "http",
+    "maintainer": "takashiski",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0",
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+                "rows": ["B5", "B4", "E6", "D7", "C6"]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+
+                {"matrix": [5, 0], "x": 8.75, "y": 0},
+                {"matrix": [5, 1], "x": 9.75, "y": 0},
+                {"matrix": [5, 2], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 4], "x": 12.75, "y": 0},
+                {"matrix": [5, 5], "x": 13.75, "y": 0},
+                {"matrix": [5, 6], "x": 14.75, "y": 0},
+                {"matrix": [5, 7], "x": 15.75, "y": 0},
+                {"matrix": [6, 7], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [6, 1], "x": 10.25, "y": 1},
+                {"matrix": [6, 2], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 4], "x": 13.25, "y": 1},
+                {"matrix": [6, 5], "x": 14.25, "y": 1},
+                {"matrix": [6, 6], "x": 15.25, "y": 1},
+                {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 0], "x": 9.5, "y": 2},
+                {"matrix": [7, 1], "x": 10.5, "y": 2},
+                {"matrix": [7, 2], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 4], "x": 13.5, "y": 2},
+                {"matrix": [7, 5], "x": 14.5, "y": 2},
+                {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 4], "x": 13, "y": 3},
+                {"matrix": [8, 5], "x": 14, "y": 3},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 5.5, "y": 4},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+
+                {"matrix": [9, 0], "x": 8.75, "y": 4},
+                {"matrix": [9, 1], "x": 9.75, "y": 4},
+                {"matrix": [9, 2], "x": 10.75, "y": 4},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4},
+                {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk
deleted file mode 100644
index d43bca5db2a..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/rules.mk
+++ /dev/null
@@ -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 = 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
-SPLIT_KEYBOARD=yes
diff --git a/keyboards/teleport/native/ansi/keymaps/default/keymap.c b/keyboards/teleport/native/ansi/keymaps/default/keymap.c
index 2780fdda7dd..60983df4351 100644
--- a/keyboards/teleport/native/ansi/keymaps/default/keymap.c
+++ b/keyboards/teleport/native/ansi/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_MOD,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,     KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
index e34f0f9d164..aa5c7a0f993 100644
--- a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
+++ b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,     KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            TO(PERF),                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/teleport/native/ansi/keymaps/via/keymap.c b/keyboards/teleport/native/ansi/keymaps/via/keymap.c
index 95a5bc58b13..17c566d47c2 100644
--- a/keyboards/teleport/native/ansi/keymaps/via/keymap.c
+++ b/keyboards/teleport/native/ansi/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_MOD,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,     KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/teleport/native/iso/keymaps/default/keymap.c b/keyboards/teleport/native/iso/keymaps/default/keymap.c
index b6f2e7ab82f..68105f0a021 100644
--- a/keyboards/teleport/native/iso/keymaps/default/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_MOD,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
index ca311edf5e1..96018a2fb82 100644
--- a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c
@@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            TO(PERF),                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
diff --git a/keyboards/teleport/native/iso/keymaps/via/keymap.c b/keyboards/teleport/native/iso/keymaps/via/keymap.c
index b6f2e7ab82f..68105f0a021 100644
--- a/keyboards/teleport/native/iso/keymaps/via/keymap.c
+++ b/keyboards/teleport/native/iso/keymaps/via/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     RGB_RMOD,
         RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   RGB_MOD,
         KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,     KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, TG(GAME),KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
diff --git a/keyboards/teleport/tkl/keymaps/ansi/keymap.c b/keyboards/teleport/tkl/keymaps/ansi/keymap.c
index ed8255aaf25..735270fb0b2 100644
--- a/keyboards/teleport/tkl/keymaps/ansi/keymap.c
+++ b/keyboards/teleport/tkl/keymaps/ansi/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/teleport/tkl/keymaps/default/keymap.c b/keyboards/teleport/tkl/keymaps/default/keymap.c
index 76a4fc7aa6d..0568b79c771 100644
--- a/keyboards/teleport/tkl/keymaps/default/keymap.c
+++ b/keyboards/teleport/tkl/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/teleport/tkl/keymaps/iso/keymap.c b/keyboards/teleport/tkl/keymaps/iso/keymap.c
index fdadd4ea24a..d5de75f130a 100644
--- a/keyboards/teleport/tkl/keymaps/iso/keymap.c
+++ b/keyboards/teleport/tkl/keymaps/iso/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/teleport/tkl/keymaps/via/keymap.c b/keyboards/teleport/tkl/keymaps/via/keymap.c
index 76a4fc7aa6d..0568b79c771 100644
--- a/keyboards/teleport/tkl/keymaps/via/keymap.c
+++ b/keyboards/teleport/tkl/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,  KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c
index a18a2b20edd..c74ba0d7c70 100644
--- a/keyboards/telophase/matrix.c
+++ b/keyboards/telophase/matrix.c
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "quantum.h"
 #include "matrix.h"
 #include "uart.h"
 
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 53b0bd4c519..34aa7c4324a 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -17,10 +17,6 @@
 #include "terrazzo.h"
 
 #ifdef LED_MATRIX_ENABLE
-    #include <math.h>
-    #include "print.h"
-    #include "quantum.h"
-
 const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf
diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
index fec08cea3ea..fadf9990cd9 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
@@ -63,26 +63,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       switch(keycode) {
         case DVORAK:
           if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_DV);
+            set_single_persistent_default_layer(_DV);
           }
           return false;
         case QWERTY:
           if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_QW);
+            set_single_persistent_default_layer(_QW);
           }
           return false;
         case COLEMAK:
           if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_CM);
+            set_single_persistent_default_layer(_CM);
           }
           return false;
         default:
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
index 32e4694cd55..ac9d97bde54 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
@@ -1,6 +1,5 @@
 #include QMK_KEYBOARD_H
 
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -8,10 +7,6 @@
 
 #define _NP 0
 
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NP] = LAYOUT_numpad_4x4( /* Numpad */
     KC_P7, KC_P8,   KC_P9,   KC_PPLS,
@@ -20,21 +15,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,          KC_PDOT
   ),
 };
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      switch(keycode) {
-        case NUMPAD:
-          if (record->event.pressed) {
-            persistent_default_layer_set(1UL<<_NP);
-          }
-          return false;
-        default:
-          return true;
-      }
-    return true;
-};
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index de4fa5cd491..7700780b2e8 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -39,6 +39,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "A15",
         "matrix_pins": {
             "right": {
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 86483ba9207..5b78d6fe55c 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -13,7 +13,6 @@ ENCODER_ENABLE = yes        # Enable rotary encoder support
 AUDIO_ENABLE = no           # Audio output
 KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
 OLED_ENABLE = yes
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c
index 87944cb7cc6..7929e0969b5 100644
--- a/keyboards/touchpad/matrix.c
+++ b/keyboards/touchpad/matrix.c
@@ -23,7 +23,8 @@ SOFTWARE.
 
 #include "matrix.h"
 #include "i2c_master.h"
-#include "quantum.h"
+#include "print.h"
+#include <string.h>
 
 #define VIBRATE_LENGTH 50 //Defines number of interrupts motor will vibrate for, must be bigger than 8 for correct operation
 volatile uint8_t vibrate = 0; //Trigger vibration in interrupt
@@ -276,16 +277,16 @@ matrix_row_t matrix_get_row(uint8_t row) {
 }
 
 void matrix_print(void) {
-    printf("\nr/c 01234567\n");
+    xprintf("\nr/c 01234567\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        printf("%X0: ", row);
+        xprintf("%X0: ", row);
         matrix_row_t data = matrix_get_row(row);
         for (int col = 0; col < MATRIX_COLS; col++) {
             if (data & (1<<col))
-                printf("1");
+                xprintf("1");
             else
-                printf("0");
+                xprintf("0");
         }
-        printf("\n");
+        xprintf("\n");
     }
 }
diff --git a/keyboards/trashman/ketch/keyboard.json b/keyboards/trashman/ketch/keyboard.json
index 6e042eee0b1..8f0a638e63e 100644
--- a/keyboards/trashman/ketch/keyboard.json
+++ b/keyboards/trashman/ketch/keyboard.json
@@ -139,7 +139,7 @@
 
         {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
         {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
-        {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
         {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
         {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
         {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index f4660c3ad9f..2c3f85cdd9f 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -14,7 +14,6 @@
         "nkro": true,
         "oled": true,
         "rgblight": true,
-        "split": true,
         "tri_layer": true
     },
     "rgblight": {
@@ -118,4 +117,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c
index 17e5833ee9e..8d6e2ec92e2 100644
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@@ -1,12 +1,10 @@
 // Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
-#include <hal_pal.h>
 #include "djinn.h"
+#include <string.h>
+#include <hal_pal.h>
 #include "serial.h"
 #include "split_util.h"
-#include "qp.h"
 
 painter_device_t lcd;
 
diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
index ac81ad18c1b..63f480be270 100644
--- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c
+++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
@@ -1,8 +1,5 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <ch.h>
-#include <hal.h>
-#include "quantum.h"
 #include "djinn.h"
 
 #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15
diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c
index 8b10e88b4b2..3a2a8a4ff3e 100644
--- a/keyboards/tzarc/djinn/djinn_split_sync.c
+++ b/keyboards/tzarc/djinn/djinn_split_sync.c
@@ -1,7 +1,5 @@
 // Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
 #include "transactions.h"
 #include "split_util.h"
 #include "djinn.h"
diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c
index 7a56f92b8e9..e4e75f20d80 100644
--- a/keyboards/tzarc/djinn/djinn_usbpd.c
+++ b/keyboards/tzarc/djinn/djinn_usbpd.c
@@ -1,7 +1,5 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
 #include "djinn.h"
 
 const char* usbpd_str(usbpd_allowance_t allowance) {
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
deleted file mode 100644
index cf7067f629c..00000000000
--- a/keyboards/unikeyboard/diverge3/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "keyboard_name": "Diverge3",
-  "manufacturer": "UniKeyboard",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x1257",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-    "rows": ["D4", "D7", "E6", "B4", "B5"]
-  },
-  "diode_direction": "ROW2COL",
-  "backlight": {
-    "pin": "C6",
-    "levels": 5,
-    "breathing": true
-  },
-  "split": {
-    "soft_serial_pin": "D0"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0.75},
-        {"matrix": [0, 2], "x": 2, "y": 0.25},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0.25},
-        {"matrix": [0, 6], "x": 6, "y": 0.5},
-
-        {"matrix": [5, 6], "x": 10, "y": 0.5},
-        {"matrix": [5, 5], "x": 11, "y": 0.25},
-        {"matrix": [5, 4], "x": 12, "y": 0},
-        {"matrix": [5, 3], "x": 13, "y": 0},
-        {"matrix": [5, 2], "x": 14, "y": 0.25},
-        {"matrix": [5, 1], "x": 15, "y": 0.75},
-        {"matrix": [5, 0], "x": 16, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1.75},
-        {"matrix": [1, 2], "x": 2, "y": 1.25},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1.25},
-        {"matrix": [1, 6], "x": 6, "y": 1.5},
-
-        {"matrix": [6, 6], "x": 10, "y": 1.5},
-        {"matrix": [6, 5], "x": 11, "y": 1.25},
-        {"matrix": [6, 4], "x": 12, "y": 1},
-        {"matrix": [6, 3], "x": 13, "y": 1},
-        {"matrix": [6, 2], "x": 14, "y": 1.25},
-        {"matrix": [6, 1], "x": 15, "y": 1.75},
-        {"matrix": [6, 0], "x": 16, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-        {"matrix": [2, 1], "x": 1, "y": 2.75},
-        {"matrix": [2, 2], "x": 2, "y": 2.25},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 4], "x": 4, "y": 2},
-        {"matrix": [2, 5], "x": 5, "y": 2.25},
-        {"matrix": [2, 6], "x": 6, "y": 2.5},
-
-        {"matrix": [7, 6], "x": 10, "y": 2.5},
-        {"matrix": [7, 5], "x": 11, "y": 2.25},
-        {"matrix": [7, 4], "x": 12, "y": 2},
-        {"matrix": [7, 3], "x": 13, "y": 2},
-        {"matrix": [7, 2], "x": 14, "y": 2.25},
-        {"matrix": [7, 1], "x": 15, "y": 2.75},
-        {"matrix": [7, 0], "x": 16, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-        {"matrix": [3, 1], "x": 1, "y": 3.75},
-        {"matrix": [3, 2], "x": 2, "y": 3.25},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 4], "x": 4, "y": 3},
-        {"matrix": [3, 5], "x": 5, "y": 3.25},
-        {"matrix": [3, 6], "x": 6, "y": 3.5},
-
-        {"matrix": [8, 6], "x": 10, "y": 3.5},
-        {"matrix": [8, 5], "x": 11, "y": 3.25},
-        {"matrix": [8, 4], "x": 12, "y": 3},
-        {"matrix": [8, 3], "x": 13, "y": 3},
-        {"matrix": [8, 2], "x": 14, "y": 3.25},
-        {"matrix": [8, 1], "x": 15, "y": 3.75},
-        {"matrix": [8, 0], "x": 16, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-        {"matrix": [4, 1], "x": 1, "y": 4.75},
-        {"matrix": [4, 2], "x": 2, "y": 4.25},
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 4], "x": 4, "y": 4},
-        {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
-        {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
-        {"matrix": [4, 7], "x": 7, "y": 5.25},
-
-        {"matrix": [9, 7], "x": 9, "y": 5.25},
-        {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
-        {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
-        {"matrix": [9, 4], "x": 12, "y": 4},
-        {"matrix": [9, 3], "x": 13, "y": 4},
-        {"matrix": [9, 2], "x": 14, "y": 4.25},
-        {"matrix": [9, 1], "x": 15, "y": 4.75},
-        {"matrix": [9, 0], "x": 16, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json
new file mode 100644
index 00000000000..a6dd684be6d
--- /dev/null
+++ b/keyboards/unikeyboard/diverge3/keyboard.json
@@ -0,0 +1,123 @@
+{
+  "keyboard_name": "Diverge3",
+  "manufacturer": "UniKeyboard",
+  "url": "",
+  "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1257",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": false,
+    "command": true,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D4", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "ROW2COL",
+  "backlight": {
+    "pin": "C6",
+    "levels": 5,
+    "breathing": true
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D0"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0.75},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0.25},
+        {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+        {"matrix": [5, 6], "x": 10, "y": 0.5},
+        {"matrix": [5, 5], "x": 11, "y": 0.25},
+        {"matrix": [5, 4], "x": 12, "y": 0},
+        {"matrix": [5, 3], "x": 13, "y": 0},
+        {"matrix": [5, 2], "x": 14, "y": 0.25},
+        {"matrix": [5, 1], "x": 15, "y": 0.75},
+        {"matrix": [5, 0], "x": 16, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1.75},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+        {"matrix": [6, 6], "x": 10, "y": 1.5},
+        {"matrix": [6, 5], "x": 11, "y": 1.25},
+        {"matrix": [6, 4], "x": 12, "y": 1},
+        {"matrix": [6, 3], "x": 13, "y": 1},
+        {"matrix": [6, 2], "x": 14, "y": 1.25},
+        {"matrix": [6, 1], "x": 15, "y": 1.75},
+        {"matrix": [6, 0], "x": 16, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2.75},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+        {"matrix": [7, 6], "x": 10, "y": 2.5},
+        {"matrix": [7, 5], "x": 11, "y": 2.25},
+        {"matrix": [7, 4], "x": 12, "y": 2},
+        {"matrix": [7, 3], "x": 13, "y": 2},
+        {"matrix": [7, 2], "x": 14, "y": 2.25},
+        {"matrix": [7, 1], "x": 15, "y": 2.75},
+        {"matrix": [7, 0], "x": 16, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3.75},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3.25},
+        {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+        {"matrix": [8, 6], "x": 10, "y": 3.5},
+        {"matrix": [8, 5], "x": 11, "y": 3.25},
+        {"matrix": [8, 4], "x": 12, "y": 3},
+        {"matrix": [8, 3], "x": 13, "y": 3},
+        {"matrix": [8, 2], "x": 14, "y": 3.25},
+        {"matrix": [8, 1], "x": 15, "y": 3.75},
+        {"matrix": [8, 0], "x": 16, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4.75},
+        {"matrix": [4, 2], "x": 2, "y": 4.25},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
+        {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
+        {"matrix": [4, 7], "x": 7, "y": 5.25},
+
+        {"matrix": [9, 7], "x": 9, "y": 5.25},
+        {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
+        {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
+        {"matrix": [9, 4], "x": 12, "y": 4},
+        {"matrix": [9, 3], "x": 13, "y": 4},
+        {"matrix": [9, 2], "x": 14, "y": 4.25},
+        {"matrix": [9, 1], "x": 15, "y": 4.75},
+        {"matrix": [9, 0], "x": 16, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk
deleted file mode 100644
index 40695440183..00000000000
--- a/keyboards/unikeyboard/diverge3/rules.mk
+++ /dev/null
@@ -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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
deleted file mode 100644
index 9533371de12..00000000000
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "keyboard_name": "Diverge TM 2",
-    "manufacturer": "UniKeyboard",
-    "url": "",
-    "maintainer": "islandman93, xton",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1256",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "ROW2COL",
-    "split": {
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layout_aliases": {
-        "LAYOUT_ortho_4x12_2x2u": "LAYOUT"
-    },
-    "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": [4, 5], "x": 7, "y": 0},
-                {"matrix": [4, 4], "x": 8, "y": 0},
-                {"matrix": [4, 3], "x": 9, "y": 0},
-                {"matrix": [4, 2], "x": 10, "y": 0},
-                {"matrix": [4, 1], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [5, 5], "x": 7, "y": 1},
-                {"matrix": [5, 4], "x": 8, "y": 1},
-                {"matrix": [5, 3], "x": 9, "y": 1},
-                {"matrix": [5, 2], "x": 10, "y": 1},
-                {"matrix": [5, 1], "x": 11, "y": 1},
-                {"matrix": [5, 0], "x": 12, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [6, 5], "x": 7, "y": 2},
-                {"matrix": [6, 4], "x": 8, "y": 2},
-                {"matrix": [6, 3], "x": 9, "y": 2},
-                {"matrix": [6, 2], "x": 10, "y": 2},
-                {"matrix": [6, 1], "x": 11, "y": 2},
-                {"matrix": [6, 0], "x": 12, "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, "w": 2},
-
-                {"matrix": [7, 4], "x": 7, "y": 3, "w": 2},
-                {"matrix": [7, 3], "x": 9, "y": 3},
-                {"matrix": [7, 2], "x": 10, "y": 3},
-                {"matrix": [7, 1], "x": 11, "y": 3},
-                {"matrix": [7, 0], "x": 12, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json
new file mode 100644
index 00000000000..3c1420c39ad
--- /dev/null
+++ b/keyboards/unikeyboard/divergetm2/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "Diverge TM 2",
+    "manufacturer": "UniKeyboard",
+    "url": "",
+    "maintainer": "islandman93, xton",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1256",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_ortho_4x12_2x2u": "LAYOUT"
+    },
+    "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": [4, 5], "x": 7, "y": 0},
+                {"matrix": [4, 4], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 5], "x": 7, "y": 1},
+                {"matrix": [5, 4], "x": 8, "y": 1},
+                {"matrix": [5, 3], "x": 9, "y": 1},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 0], "x": 12, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [6, 5], "x": 7, "y": 2},
+                {"matrix": [6, 4], "x": 8, "y": 2},
+                {"matrix": [6, 3], "x": 9, "y": 2},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 1], "x": 11, "y": 2},
+                {"matrix": [6, 0], "x": 12, "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, "w": 2},
+
+                {"matrix": [7, 4], "x": 7, "y": 3, "w": 2},
+                {"matrix": [7, 3], "x": 9, "y": 3},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 1], "x": 11, "y": 3},
+                {"matrix": [7, 0], "x": 12, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
index d4f38e4a199..3111ac26d76 100644
--- a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
@@ -170,7 +170,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_qwerty);
         #endif
-        set_single_persistent_default_layer(1UL<<_QWERTY);
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
@@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_colemak);
         #endif
-        set_single_persistent_default_layer(1UL<<_COLEMAK);
+        set_single_persistent_default_layer(_COLEMAK);
       }
       return false;
       break;
@@ -188,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         #ifdef AUDIO_ENABLE
           PLAY_SONG(tone_dvorak);
         #endif
-        set_single_persistent_default_layer(1UL<<_DVORAK);
+        set_single_persistent_default_layer(_DVORAK);
       }
       return false;
       break;
diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
deleted file mode 100644
index 7f1fc659ccb..00000000000
--- a/keyboards/unikeyboard/divergetm2/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index 1354c6d93e6..c7d6f7159bb 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -14,6 +14,7 @@
   },
   "diode_direction": "COL2ROW",
   "split": {
+    "enabled": true,
     "soft_serial_pin": "D2"
   },
   "ws2812": {
diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk
index ceb65c3053f..49b64b12745 100644
--- a/keyboards/uzu42/rules.mk
+++ b/keyboards/uzu42/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no      # OLED display
-SPLIT_KEYBOARD = yes
 
 DEFAULT_FOLDER = uzu42/rev1
diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c
index b266472e64e..540c5ec6ecf 100644
--- a/keyboards/v60_type_r/v60_type_r.c
+++ b/keyboards/v60_type_r/v60_type_r.c
@@ -15,8 +15,6 @@
  */
 #include "v60_type_r.h"
 
-#include "quantum.h"
-
 // if we've got an RGB underglow!
 #ifdef RGBLIGHT_ENABLE
 
diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h
index 1a7098fc416..ae2381a9514 100644
--- a/keyboards/v60_type_r/v60_type_r.h
+++ b/keyboards/v60_type_r/v60_type_r.h
@@ -19,8 +19,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 
-#include "rgblight.h"
-
 void rgb_init(void);
 void set_rgb_color(uint8_t pin, uint8_t value, uint8_t timer_value);
 
diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/keyboard.json
similarity index 100%
rename from keyboards/vertex/arc60/info.json
rename to keyboards/vertex/arc60/keyboard.json
diff --git a/keyboards/vertex/arc60/rules.mk b/keyboards/vertex/arc60/rules.mk
deleted file mode 100644
index dd76c3f2cec..00000000000
--- a/keyboards/vertex/arc60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = vertex/arc60
diff --git a/keyboards/viendi8l/keymaps/default/keymap.c b/keyboards/viendi8l/keymaps/default/keymap.c
index 0a2f96c20be..40ac1fb8986 100755
--- a/keyboards/viendi8l/keymaps/default/keymap.c
+++ b/keyboards/viendi8l/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MINS, KC_F7,   KC_F8,   KC_F9,      KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
         KC_EQL,  KC_F4,   KC_F5,   KC_F6,      _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,      XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GUI_TOG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
+        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GU_TOGG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
     )
 
 };
diff --git a/keyboards/viendi8l/keymaps/via/keymap.c b/keyboards/viendi8l/keymaps/via/keymap.c
index 59adaa62417..4989ba89db4 100755
--- a/keyboards/viendi8l/keymaps/via/keymap.c
+++ b/keyboards/viendi8l/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MINS, KC_F7,   KC_F8,   KC_F9,      KC_TAB,  XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL,
         KC_EQL,  KC_F4,   KC_F5,   KC_F6,      _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
         XXXXXXX, KC_F1,   KC_F2,   KC_F3,      XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GUI_TOG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
+        XXXXXXX, KC_CALC, KC_CALC, KC_DEL,     XXXXXXX, GU_TOGG, KC_SLEP,                            XXXXXXX,                   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
     ),
 
     [3] = LAYOUT_all(
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
index 569c8785822..edd5f9a31db 100644
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 
diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c
index e4f59c3b6bf..93e698412a0 100644
--- a/keyboards/viktus/osav2_numpad_topre/ec.c
+++ b/keyboards/viktus/osav2_numpad_topre/ec.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 
diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c
index 076ffc0ba86..13d9fde654c 100644
--- a/keyboards/viktus/osav2_topre/ec.c
+++ b/keyboards/viktus/osav2_topre/ec.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 
diff --git a/keyboards/viktus/sp111/matrix.c b/keyboards/viktus/sp111/matrix.c
index a39365cef60..35a1a740fc3 100644
--- a/keyboards/viktus/sp111/matrix.c
+++ b/keyboards/viktus/sp111/matrix.c
@@ -13,8 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "matrix.h"
 #include "mcp23018.h"
-#include "quantum.h"
+#include "print.h"
+#include "wait.h"
 
 // Optimize scanning code for speed as a slight mitigation for the port expander
 #pragma GCC push_options
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
deleted file mode 100644
index 6deb64c63ca..00000000000
--- a/keyboards/viktus/sp_mini/info.json
+++ /dev/null
@@ -1,685 +0,0 @@
-{
-    "keyboard_name": "SP_Mini",
-    "manufacturer": "Viktus Design LLC",
-    "url": "",
-    "maintainer": "jrfhoutx",
-    "usb": {
-        "vid": "0x5644",
-        "pid": "0x534D",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
-        "rows": ["F0", "B5", "B4", "D7", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F4", "pin_b": "F1", "resolution": 8}
-        ]
-    },
-    "split": {
-        "matrix_pins": {
-            "right": {
-                "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
-                "rows": ["F0", "B5", "B4", "D7", "D6"]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 24,
-        "split_count": [12, 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": "E6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "\u25bd", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "\u25bd", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "\u25bd", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "\u25bd", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "\u25bd", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "\u25bd", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "\u25bd", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "\u25bd", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "\u25bd", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
-                {"label": "\u25bd", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "\u25bd", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
-                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_4l2r": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_4l2r_split_bs": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_4l": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
-                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_4l_split_bs": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
-                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_2r": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        },
-        "LAYOUT_2r_split_bs": {
-            "layout": [
-                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
-                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
-                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
-                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
-                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
-                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
-                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
-                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
-                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
-                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
-                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
-                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
-                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
-                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
-                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
-                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
-                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
-                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
-                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
-                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
-                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
-                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
-                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
-                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
-                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
-                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
-                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
-                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
-                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
-                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
-                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
-                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
-                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
-                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
-                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
-                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
-                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
-                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
-                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
-                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
-                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
-                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/viktus/sp_mini/keyboard.json b/keyboards/viktus/sp_mini/keyboard.json
new file mode 100644
index 00000000000..25aa4c94942
--- /dev/null
+++ b/keyboards/viktus/sp_mini/keyboard.json
@@ -0,0 +1,696 @@
+{
+    "keyboard_name": "SP_Mini",
+    "manufacturer": "Viktus Design LLC",
+    "url": "",
+    "maintainer": "jrfhoutx",
+    "usb": {
+        "vid": "0x5644",
+        "pid": "0x534D",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
+        "rows": ["F0", "B5", "B4", "D7", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F4", "pin_b": "F1", "resolution": 8}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "matrix_pins": {
+            "right": {
+                "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
+                "rows": ["F0", "B5", "B4", "D7", "D6"]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 24,
+        "split_count": [12, 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": "E6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "\u25bd", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "\u25bd", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "\u25bd", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "\u25bd", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "\u25bd", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"label": "\u25bd", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "\u25bd", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_4l2r": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_4l2r_split_bs": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_4l": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_4l_split_bs": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+                {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_2r": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        },
+        "LAYOUT_2r_split_bs": {
+            "layout": [
+                {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+                {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+                {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+                {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+                {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+                {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+                {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+                {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+                {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+                {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+                {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+                {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+                {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+                {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+                {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk
deleted file mode 100644
index ca2a1036c34..00000000000
--- a/keyboards/viktus/sp_mini/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c
index c9980461afb..078723f691e 100644
--- a/keyboards/viktus/styrka_topre/ec.c
+++ b/keyboards/viktus/styrka_topre/ec.c
@@ -15,8 +15,8 @@
  */
 
 #include "ec.h"
+#include <avr/interrupt.h>
 
-#include "quantum.h"
 #include "analog.h"
 //#include "debug.h"
 
diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c
index 707955ee881..773a882f508 100644
--- a/keyboards/vinhcatba/uncertainty/bongo.c
+++ b/keyboards/vinhcatba/uncertainty/bongo.c
@@ -1,7 +1,14 @@
 // Copyright 2022 Parker Levin (@pedker)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "bongo.h"
+#include <stdlib.h>
 #include "quantum.h"
+#include "matrix.h"
+#include "oled_driver.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
 
 #define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms
 #define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h
index d1cecbc6197..c4bb1ed6756 100644
--- a/keyboards/vinhcatba/uncertainty/bongo.h
+++ b/keyboards/vinhcatba/uncertainty/bongo.h
@@ -3,4 +3,6 @@
 
 #pragma once
 
+#include <stdbool.h>
+
 void draw_bongo(bool minimal);
diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c
index 19e5a5cfd53..c569f07a3bd 100644
--- a/keyboards/vinhcatba/uncertainty/uncertainty.c
+++ b/keyboards/vinhcatba/uncertainty/uncertainty.c
@@ -1,8 +1,7 @@
 // Copyright 2023 Vinh Le (@vinhcatba)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
-#include "quantum.h"
+#include "uncertainty.h"
 
 #ifdef OLED_ENABLE
 #include "bongo.h"
diff --git a/keyboards/vitamins_included/keymaps/default/keymap.c b/keyboards/vitamins_included/keymaps/default/keymap.c
index 59903b1a6f7..0f90fe22bdb 100644
--- a/keyboards/vitamins_included/keymaps/default/keymap.c
+++ b/keyboards/vitamins_included/keymaps/default/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-
-
 // Layer names
 
 enum layer_names {
@@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
   QK_BOOT,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,
-  TG_NKRO, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
 /* Raise
@@ -111,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_RAISE] = LAYOUT_ortho_4x12(
   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
   KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, TG_NKRO, QK_BOOT,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, NK_TOGG, QK_BOOT,
   _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
index ff1504a5aa7..de21929c39b 100644
--- a/keyboards/vitamins_included/rev1/info.json
+++ b/keyboards/vitamins_included/rev1/info.json
@@ -8,6 +8,7 @@
     },
     "diode_direction": "COL2ROW",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk
index d38a6180907..3bbd2614291 100644
--- a/keyboards/vitamins_included/rev1/rules.mk
+++ b/keyboards/vitamins_included/rev1/rules.mk
@@ -1 +1 @@
-SPLIT_KEYBOARD = yes
+# File intentionally blank
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
index ed8596538df..4418b869099 100644
--- a/keyboards/vitamins_included/rev2/info.json
+++ b/keyboards/vitamins_included/rev2/info.json
@@ -14,6 +14,7 @@
         "speaker": "C6"
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D0"
     },
     "rgblight": {
diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk
index 9f05083d69e..fe598d78616 100644
--- a/keyboards/vitamins_included/rev2/rules.mk
+++ b/keyboards/vitamins_included/rev2/rules.mk
@@ -1,4 +1,2 @@
-SPLIT_KEYBOARD = yes
-
 # Disable unsupported hardware
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
deleted file mode 100644
index 159773a1c97..00000000000
--- a/keyboards/waterfowl/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "keyboard_name": "Waterfowl",
-    "manufacturer": "CyanDuck",
-    "url": "",
-    "maintainer": "JW2586",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x9CE3",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1"],
-        "rows": ["D4", "C6", "D7", "E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B4", "pin_b": "B5"},
-            {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "transport": {
-            "sync": {
-                "modifiers": true,
-                "wpm": true
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0.375},
-                {"matrix": [0, 4], "x": 4, "y": 0.5},
-
-                {"matrix": [4, 4], "x": 9, "y": 0.5},
-                {"matrix": [4, 3], "x": 10, "y": 0.375},
-                {"matrix": [4, 2], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0.25},
-                {"matrix": [4, 0], "x": 13, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1.375},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-
-                {"matrix": [5, 4], "x": 9, "y": 1.5},
-                {"matrix": [5, 3], "x": 10, "y": 1.375},
-                {"matrix": [5, 2], "x": 11, "y": 1},
-                {"matrix": [5, 1], "x": 12, "y": 1.25},
-                {"matrix": [5, 0], "x": 13, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 2.25},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2.375},
-                {"matrix": [2, 4], "x": 4, "y": 2.5},
-
-                {"matrix": [6, 4], "x": 9, "y": 2.5},
-                {"matrix": [6, 3], "x": 10, "y": 2.375},
-                {"matrix": [6, 2], "x": 11, "y": 2},
-                {"matrix": [6, 1], "x": 12, "y": 2.25},
-                {"matrix": [6, 0], "x": 13, "y": 3},
-
-                {"matrix": [3, 0], "x": 2, "y": 3.5},
-                {"matrix": [3, 1], "x": 3.5, "y": 3.5},
-                {"matrix": [3, 2], "x": 4.5, "y": 3.7},
-                {"matrix": [3, 3], "x": 5.5, "y": 4.1},
-                {"matrix": [3, 4], "x": 5.5, "y": 2.5},
-
-                {"matrix": [7, 4], "x": 7.5, "y": 2.5},
-                {"matrix": [7, 3], "x": 7.5, "y": 4.1},
-                {"matrix": [7, 2], "x": 8.5, "y": 3.7},
-                {"matrix": [7, 1], "x": 9.5, "y": 3.5},
-                {"matrix": [7, 0], "x": 11, "y": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/waterfowl/keyboard.json b/keyboards/waterfowl/keyboard.json
new file mode 100644
index 00000000000..a1783130426
--- /dev/null
+++ b/keyboards/waterfowl/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "Waterfowl",
+    "manufacturer": "CyanDuck",
+    "url": "",
+    "maintainer": "JW2586",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x9CE3",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"},
+            {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "transport": {
+            "sync": {
+                "modifiers": true,
+                "wpm": true
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.375},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+                {"matrix": [4, 4], "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "x": 10, "y": 0.375},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 1], "x": 12, "y": 0.25},
+                {"matrix": [4, 0], "x": 13, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.375},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [5, 4], "x": 9, "y": 1.5},
+                {"matrix": [5, 3], "x": 10, "y": 1.375},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 1], "x": 12, "y": 1.25},
+                {"matrix": [5, 0], "x": 13, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.375},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+                {"matrix": [6, 4], "x": 9, "y": 2.5},
+                {"matrix": [6, 3], "x": 10, "y": 2.375},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 1], "x": 12, "y": 2.25},
+                {"matrix": [6, 0], "x": 13, "y": 3},
+
+                {"matrix": [3, 0], "x": 2, "y": 3.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.7},
+                {"matrix": [3, 3], "x": 5.5, "y": 4.1},
+                {"matrix": [3, 4], "x": 5.5, "y": 2.5},
+
+                {"matrix": [7, 4], "x": 7.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 7.5, "y": 4.1},
+                {"matrix": [7, 2], "x": 8.5, "y": 3.7},
+                {"matrix": [7, 1], "x": 9.5, "y": 3.5},
+                {"matrix": [7, 0], "x": 11, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk
deleted file mode 100644
index 0eed9cdd8f6..00000000000
--- a/keyboards/waterfowl/rules.mk
+++ /dev/null
@@ -1,16 +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
-
-OLED_ENABLE = yes        # Enables the use of OLED displays
-SPLIT_KEYBOARD = yes     # Enables split functionality
-ENCODER_ENABLE = yes	 # Enables the encoders
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
deleted file mode 100644
index c86ead57bd8..00000000000
--- a/keyboards/wekey/we27/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 @wekey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
deleted file mode 100644
index 802ae8eed6c..00000000000
--- a/keyboards/wekey/we27/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "keyboard_name": "We27",
-    "manufacturer": "@wekey",
-    "url": "",
-    "maintainer": "@wekey.dev",
-    "usb": {
-        "vid": "0x5559",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "rainbow_moving_chevron": true
-        },
-        "default": {
-            "hue": 108
-        },
-        "driver": "ws2812",
-        "react_on_keyup": true
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "C7", "D6", "D4"],
-        "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
-        ]
-    },
-    "ws2812": {
-        "pin": "C6"
-    },
-    "build": {
-        "debounce_type": "sym_defer_pk"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["numpad_6x5"],
-    "layouts": {
-        "LAYOUT_numpad_6x5": {
-            "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.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.5},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5},
-                {"matrix": [3, 1], "x": 1, "y": 3.5},
-                {"matrix": [3, 2], "x": 2, "y": 3.5},
-                {"matrix": [3, 3], "x": 3, "y": 3.5},
-                {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5},
-                {"matrix": [4, 1], "x": 1, "y": 4.5},
-                {"matrix": [4, 2], "x": 2, "y": 4.5},
-                {"matrix": [4, 3], "x": 3, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5},
-                {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
-                {"matrix": [5, 3], "x": 3, "y": 5.5},
-                {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wekey/we27/keyboard.json b/keyboards/wekey/we27/keyboard.json
new file mode 100644
index 00000000000..d8cb7b0f802
--- /dev/null
+++ b/keyboards/wekey/we27/keyboard.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "We27",
+    "manufacturer": "@wekey",
+    "url": "",
+    "maintainer": "@wekey.dev",
+    "usb": {
+        "vid": "0x5559",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgb_matrix": {
+        "animations": {
+            "rainbow_moving_chevron": true
+        },
+        "default": {
+            "hue": 108
+        },
+        "driver": "ws2812",
+        "react_on_keyup": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "C7", "D6", "D4"],
+        "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
+        ]
+    },
+    "ws2812": {
+        "pin": "C6"
+    },
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "community_layouts": ["numpad_6x5"],
+    "layouts": {
+        "LAYOUT_numpad_6x5": {
+            "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.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
+                {"matrix": [5, 3], "x": 3, "y": 5.5},
+                {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index 1c5cc136ca4..942ef4c5dbd 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
-
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
deleted file mode 100644
index 4e85b2e402a..00000000000
--- a/keyboards/westm/westmergo/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
deleted file mode 100644
index de733b988a8..00000000000
--- a/keyboards/westm/westmergo/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "keyboard_name": "WestMErgo",
-    "manufacturer": "WestM",
-    "url": "https://github.com/WestMProducts",
-    "maintainer": "WestM",
-    "usb": {
-        "vid": "0x574D",
-        "pid": "0x0201",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 16,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "A8"
-    },
-    "matrix_pins": {
-        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["A13", "B9", "F1", "A10", "A9"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["alice"],
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.5, "y": 0},
-                {"matrix": [0, 2], "x": 2.5, "y": 0},
-                {"matrix": [0, 3], "x": 3.5, "y": 0},
-                {"matrix": [0, 4], "x": 4.5, "y": 0},
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-
-                {"matrix": [0, 8], "x": 10.5, "y": 0},
-                {"matrix": [0, 9], "x": 11.5, "y": 0},
-                {"matrix": [0, 10], "x": 12.5, "y": 0},
-                {"matrix": [0, 11], "x": 13.5, "y": 0},
-                {"matrix": [0, 13], "x": 14.5, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1},
-
-                {"matrix": [1, 8], "x": 10, "y": 1},
-                {"matrix": [1, 9], "x": 11, "y": 1},
-                {"matrix": [1, 10], "x": 12, "y": 1},
-                {"matrix": [1, 11], "x": 13, "y": 1},
-                {"matrix": [1, 12], "x": 14, "y": 1},
-                {"matrix": [1, 13], "x": 15, "y": 1},
-                {"matrix": [1, 14], "x": 16, "y": 1},
-                {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3.25, "y": 2},
-                {"matrix": [2, 3], "x": 4.25, "y": 2},
-                {"matrix": [2, 4], "x": 5.25, "y": 2},
-                {"matrix": [2, 5], "x": 6.25, "y": 2},
-                {"matrix": [2, 6], "x": 7.25, "y": 2},
-
-                {"matrix": [2, 8], "x": 10.25, "y": 2},
-                {"matrix": [2, 9], "x": 11.25, "y": 2},
-                {"matrix": [2, 10], "x": 12.25, "y": 2},
-                {"matrix": [2, 11], "x": 13.25, "y": 2},
-                {"matrix": [2, 12], "x": 14.25, "y": 2},
-                {"matrix": [2, 13], "x": 15.25, "y": 2},
-                {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.75, "y": 3},
-                {"matrix": [3, 3], "x": 4.75, "y": 3},
-                {"matrix": [3, 4], "x": 5.75, "y": 3},
-                {"matrix": [3, 5], "x": 6.75, "y": 3},
-                {"matrix": [3, 6], "x": 7.75, "y": 3},
-
-                {"matrix": [3, 8], "x": 9.75, "y": 3},
-                {"matrix": [3, 9], "x": 10.75, "y": 3},
-                {"matrix": [3, 10], "x": 11.75, "y": 3},
-                {"matrix": [3, 11], "x": 12.75, "y": 3},
-                {"matrix": [3, 12], "x": 13.75, "y": 3},
-                {"matrix": [3, 13], "x": 14.75, "y": 3},
-                {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
-                {"matrix": [3, 15], "x": 17.5, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/westm/westmergo/keyboard.json b/keyboards/westm/westmergo/keyboard.json
new file mode 100644
index 00000000000..0ead8662029
--- /dev/null
+++ b/keyboards/westm/westmergo/keyboard.json
@@ -0,0 +1,134 @@
+{
+    "keyboard_name": "WestMErgo",
+    "manufacturer": "WestM",
+    "url": "https://github.com/WestMProducts",
+    "maintainer": "WestM",
+    "usb": {
+        "vid": "0x574D",
+        "pid": "0x0201",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "led_count": 16,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "A8"
+    },
+    "matrix_pins": {
+        "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["A13", "B9", "F1", "A10", "A9"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["alice"],
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [2, 13], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk
index aae254503b0..0ab54aaaf71 100644
--- a/keyboards/westm/westmergo/rules.mk
+++ b/keyboards/westm/westmergo/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json
deleted file mode 100644
index b3e6970a3cb..00000000000
--- a/keyboards/whale/sk/v3/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "keyboard_name": "Splite Keyboard v3",
-    "manufacturer": "Whale Mo",
-    "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3",
-    "maintainer": "ncwhale",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0495",
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
-        "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 3,
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
-
-                {"matrix": [10, 6], "x": 11.5, "y": 0, "w": 1.25},
-                {"matrix": [6, 6], "x": 12.75, "y": 0},
-                {"matrix": [6, 5], "x": 13.75, "y": 0},
-                {"matrix": [6, 4], "x": 14.75, "y": 0},
-                {"matrix": [6, 3], "x": 15.75, "y": 0},
-                {"matrix": [6, 2], "x": 16.75, "y": 0},
-                {"matrix": [6, 1], "x": 17.75, "y": 0},
-                {"matrix": [6, 0], "x": 18.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
-
-                {"matrix": [7, 6], "x": 11.5, "y": 1, "w": 1.5},
-                {"matrix": [7, 5], "x": 13, "y": 1},
-                {"matrix": [7, 4], "x": 14, "y": 1},
-                {"matrix": [7, 3], "x": 15, "y": 1},
-                {"matrix": [7, 2], "x": 16, "y": 1},
-                {"matrix": [7, 1], "x": 17, "y": 1},
-                {"matrix": [7, 0], "x": 18, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
-                {"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, "w": 1.5},
-
-                {"matrix": [8, 6], "x": 11.75, "y": 2, "w": 1.5},
-                {"matrix": [8, 5], "x": 13.25, "y": 2},
-                {"matrix": [8, 4], "x": 14.25, "y": 2},
-                {"matrix": [8, 3], "x": 15.25, "y": 2},
-                {"matrix": [8, 2], "x": 16.25, "y": 2},
-                {"matrix": [8, 1], "x": 17.25, "y": 2},
-                {"matrix": [8, 0], "x": 18.25, "y": 2, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 2], "x": 2.5, "y": 3},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-
-                {"matrix": [9, 6], "x": 12.5, "y": 3},
-                {"matrix": [9, 5], "x": 13.5, "y": 3},
-                {"matrix": [9, 4], "x": 14.5, "y": 3},
-                {"matrix": [9, 3], "x": 15.5, "y": 3},
-                {"matrix": [9, 2], "x": 16.5, "y": 3},
-                {"matrix": [9, 1], "x": 17.5, "y": 3},
-                {"matrix": [9, 0], "x": 18.5, "y": 3, "w": 1.5},
-
-                {"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": [10, 5], "x": 14, "y": 4},
-                {"matrix": [10, 4], "x": 15, "y": 4},
-                {"matrix": [10, 3], "x": 16, "y": 4},
-                {"matrix": [10, 2], "x": 17, "y": 4},
-                {"matrix": [10, 1], "x": 18, "y": 4},
-                {"matrix": [10, 0], "x": 19, "y": 4},
-
-                {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-
-                {"matrix": [11, 2], "x": 10.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [11, 1], "x": 11.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-
-                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-
-                {"matrix": [11, 4], "x": 10.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [11, 3], "x": 11.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [11, 0], "x": 12.5, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
-
-                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
-
-                {"matrix": [11, 6], "x": 10.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [11, 5], "x": 11.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
-            ]
-        },
-        "LAYOUT_left_half_only": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
-
-                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 2, "y": 1},
-                {"matrix": [1, 2], "x": 3, "y": 1},
-                {"matrix": [1, 3], "x": 4, "y": 1},
-                {"matrix": [1, 4], "x": 5, "y": 1},
-                {"matrix": [1, 5], "x": 6, "y": 1},
-                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
-                {"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, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 3},
-                {"matrix": [3, 2], "x": 2.5, "y": 3},
-                {"matrix": [3, 3], "x": 3.5, "y": 3},
-                {"matrix": [3, 4], "x": 4.5, "y": 3},
-                {"matrix": [3, 5], "x": 5.5, "y": 3},
-                {"matrix": [3, 6], "x": 6.5, "y": 3},
-
-                {"matrix": [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": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-
-                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-
-                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
-                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5}
-            ]
-        },
-        "LAYOUT_right_half_only": {
-            "layout": [
-                {"matrix": [4, 6], "x": 1, "y": 0, "w": 1.25},
-                {"matrix": [0, 6], "x": 2.25, "y": 0},
-                {"matrix": [0, 5], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 3], "x": 5.25, "y": 0},
-                {"matrix": [0, 2], "x": 6.25, "y": 0},
-                {"matrix": [0, 1], "x": 7.25, "y": 0},
-                {"matrix": [0, 0], "x": 8.25, "y": 0},
-
-                {"matrix": [1, 6], "x": 1, "y": 1, "w": 1.5},
-                {"matrix": [1, 5], "x": 2.5, "y": 1},
-                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"matrix": [1, 3], "x": 4.5, "y": 1},
-                {"matrix": [1, 2], "x": 5.5, "y": 1},
-                {"matrix": [1, 1], "x": 6.5, "y": 1},
-                {"matrix": [1, 0], "x": 7.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 6], "x": 1.25, "y": 2, "w": 1.5},
-                {"matrix": [2, 5], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 3], "x": 4.75, "y": 2},
-                {"matrix": [2, 2], "x": 5.75, "y": 2},
-                {"matrix": [2, 1], "x": 6.75, "y": 2},
-                {"matrix": [2, 0], "x": 7.75, "y": 2, "w": 1.5},
-
-                {"matrix": [3, 6], "x": 2, "y": 3},
-                {"matrix": [3, 5], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 3], "x": 5, "y": 3},
-                {"matrix": [3, 2], "x": 6, "y": 3},
-                {"matrix": [3, 1], "x": 7, "y": 3},
-                {"matrix": [3, 0], "x": 8, "y": 3, "w": 1.5},
-
-                {"matrix": [4, 5], "x": 3.5, "y": 4},
-                {"matrix": [4, 4], "x": 4.5, "y": 4},
-                {"matrix": [4, 3], "x": 5.5, "y": 4},
-                {"matrix": [4, 2], "x": 6.5, "y": 4},
-                {"matrix": [4, 1], "x": 7.5, "y": 4},
-                {"matrix": [4, 0], "x": 8.5, "y": 4},
-
-                {"matrix": [5, 2], "x": 0, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [5, 1], "x": 1, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-
-                {"matrix": [5, 4], "x": 0, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [5, 3], "x": 1, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [5, 0], "x": 2, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
-
-                {"matrix": [5, 6], "x": 0, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
-                {"matrix": [5, 5], "x": 1, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/whale/sk/v3/keyboard.json b/keyboards/whale/sk/v3/keyboard.json
new file mode 100644
index 00000000000..ce73d8251cb
--- /dev/null
+++ b/keyboards/whale/sk/v3/keyboard.json
@@ -0,0 +1,242 @@
+{
+    "keyboard_name": "Splite Keyboard v3",
+    "manufacturer": "Whale Mo",
+    "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3",
+    "maintainer": "ncwhale",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0495",
+        "device_version": "0.0.3"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
+        "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "transport": {
+            "protocol": "custom"
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "debounce": 3,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+                {"matrix": [10, 6], "x": 11.5, "y": 0, "w": 1.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 0},
+                {"matrix": [6, 5], "x": 13.75, "y": 0},
+                {"matrix": [6, 4], "x": 14.75, "y": 0},
+                {"matrix": [6, 3], "x": 15.75, "y": 0},
+                {"matrix": [6, 2], "x": 16.75, "y": 0},
+                {"matrix": [6, 1], "x": 17.75, "y": 0},
+                {"matrix": [6, 0], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1},
+                {"matrix": [7, 3], "x": 15, "y": 1},
+                {"matrix": [7, 2], "x": 16, "y": 1},
+                {"matrix": [7, 1], "x": 17, "y": 1},
+                {"matrix": [7, 0], "x": 18, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+                {"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, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 11.75, "y": 2, "w": 1.5},
+                {"matrix": [8, 5], "x": 13.25, "y": 2},
+                {"matrix": [8, 4], "x": 14.25, "y": 2},
+                {"matrix": [8, 3], "x": 15.25, "y": 2},
+                {"matrix": [8, 2], "x": 16.25, "y": 2},
+                {"matrix": [8, 1], "x": 17.25, "y": 2},
+                {"matrix": [8, 0], "x": 18.25, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+                {"matrix": [9, 6], "x": 12.5, "y": 3},
+                {"matrix": [9, 5], "x": 13.5, "y": 3},
+                {"matrix": [9, 4], "x": 14.5, "y": 3},
+                {"matrix": [9, 3], "x": 15.5, "y": 3},
+                {"matrix": [9, 2], "x": 16.5, "y": 3},
+                {"matrix": [9, 1], "x": 17.5, "y": 3},
+                {"matrix": [9, 0], "x": 18.5, "y": 3, "w": 1.5},
+
+                {"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": [10, 5], "x": 14, "y": 4},
+                {"matrix": [10, 4], "x": 15, "y": 4},
+                {"matrix": [10, 3], "x": 16, "y": 4},
+                {"matrix": [10, 2], "x": 17, "y": 4},
+                {"matrix": [10, 1], "x": 18, "y": 4},
+                {"matrix": [10, 0], "x": 19, "y": 4},
+
+                {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 2], "x": 10.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 1], "x": 11.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 4], "x": 10.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 3], "x": 11.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 0], "x": 12.5, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 6], "x": 10.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 5], "x": 11.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
+            ]
+        },
+        "LAYOUT_left_half_only": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+                {"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, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+                {"matrix": [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": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5}
+            ]
+        },
+        "LAYOUT_right_half_only": {
+            "layout": [
+                {"matrix": [4, 6], "x": 1, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 2.25, "y": 0},
+                {"matrix": [0, 5], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0},
+                {"matrix": [0, 0], "x": 8.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 2], "x": 5.5, "y": 1},
+                {"matrix": [1, 1], "x": 6.5, "y": 1},
+                {"matrix": [1, 0], "x": 7.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 6], "x": 1.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 5], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 1], "x": 6.75, "y": 2},
+                {"matrix": [2, 0], "x": 7.75, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 6], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 2], "x": 6, "y": 3},
+                {"matrix": [3, 1], "x": 7, "y": 3},
+                {"matrix": [3, 0], "x": 8, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 5], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 3], "x": 5.5, "y": 4},
+                {"matrix": [4, 2], "x": 6.5, "y": 4},
+                {"matrix": [4, 1], "x": 7.5, "y": 4},
+                {"matrix": [4, 0], "x": 8.5, "y": 4},
+
+                {"matrix": [5, 2], "x": 0, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 1], "x": 1, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 4], "x": 0, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 3], "x": 1, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 0], "x": 2, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 5], "x": 1, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk
deleted file mode 100644
index 21303846dcc..00000000000
--- a/keyboards/whale/sk/v3/rules.mk
+++ /dev/null
@@ -1,15 +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
-
-SPLIT_KEYBOARD = yes
-SPLIT_TRANSPORT = custom
diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json
deleted file mode 100644
index d4a5d079b3c..00000000000
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "keyboard_name": "KARA",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x4B52",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_hhkb"],
-    "layouts": {
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_kara/keyboard.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json
new file mode 100644
index 00000000000..896892e2847
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "KARA",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x4B52",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_hhkb"],
+    "layouts": {
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk
index b49711824a2..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_kara/rules.mk
+++ b/keyboards/wilba_tech/rama_works_kara/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json
deleted file mode 100644
index 6d3def254d5..00000000000
--- a/keyboards/wilba_tech/rama_works_koyu/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "keyboard_name": "KOYU",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x4B59",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
-    },
-    "community_layouts": [
-        "65_ansi_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ",", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_koyu/keyboard.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
new file mode 100644
index 00000000000..507b5e1546f
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "KOYU",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x4B59",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+    },
+    "community_layouts": [
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ",", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk
index c921fc5c184..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_koyu/rules.mk
+++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json
deleted file mode 100644
index 3b75a67557e..00000000000
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "keyboard_name": "M10-C",
-  "manufacturer": "RAMA WORKS",
-  "url": "http://rama.works",
-  "maintainer": "Wilba",
-  "usb": {
-    "vid": "0x5241",
-    "pid": "0x00AC",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
-    "rows": ["E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "dynamic_keymap": {
-    "layer_count": 10
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-      "LAYOUT": {
-          "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-
-                {"matrix": [0, 3], "x": 0, "y": 1},
-                {"matrix": [0, 4], "x": 1, "y": 1},
-                {"matrix": [0, 5], "x": 2, "y": 1},
-
-                {"matrix": [0, 6], "x": 0, "y": 2},
-                {"matrix": [0, 7], "x": 1, "y": 2},
-                {"matrix": [0, 8], "x": 2, "y": 2},
-
-                {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
-          ]
-      }
-  }
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/keyboard.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
new file mode 100644
index 00000000000..bba4720aa34
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
@@ -0,0 +1,46 @@
+{
+  "keyboard_name": "M10-C",
+  "manufacturer": "RAMA WORKS",
+  "url": "http://rama.works",
+  "maintainer": "Wilba",
+  "usb": {
+    "vid": "0x5241",
+    "pid": "0x00AC",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "dynamic_keymap": {
+    "layer_count": 10
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+      "LAYOUT": {
+          "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
+          ]
+      }
+  }
+}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json
deleted file mode 100644
index 5745804c5dd..00000000000
--- a/keyboards/wilba_tech/rama_works_m50_a/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "keyboard_name": "M50-A",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x050A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
-        "rows": ["F0", "F1", "F5", "F6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [0, 8], "x": 8.25, "y": 0},
-                {"matrix": [0, 9], "x": 9.25, "y": 0},
-                {"matrix": [0, 10], "x": 10.25, "y": 0},
-                {"matrix": [0, 11], "x": 11.25, "y": 0},
-                {"matrix": [0, 12], "x": 12.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"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},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2},
-                {"matrix": [2, 2], "x": 2.25, "y": 2},
-                {"matrix": [2, 3], "x": 3.25, "y": 2},
-                {"matrix": [2, 4], "x": 4.25, "y": 2},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2},
-                {"matrix": [2, 7], "x": 7.25, "y": 2},
-                {"matrix": [2, 8], "x": 8.25, "y": 2},
-                {"matrix": [2, 9], "x": 9.25, "y": 2},
-                {"matrix": [2, 10], "x": 10.25, "y": 2},
-                {"matrix": [2, 11], "x": 11.25, "y": 2},
-                {"matrix": [2, 12], "x": 12.25, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-
-                {"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, "w": 2},
-                {"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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_m50_a/keyboard.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
new file mode 100644
index 00000000000..bf33a12277f
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "M50-A",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x050A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+        "rows": ["F0", "F1", "F5", "F6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"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},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"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, "w": 2},
+                {"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json
deleted file mode 100644
index 32f6f2a5d3d..00000000000
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "keyboard_name": "M60-A",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x060A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_hhkb"],
-    "layouts": {
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keyboard.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
new file mode 100644
index 00000000000..566f6cd42a4
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "M60-A",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x060A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_hhkb"],
+    "layouts": {
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
index c921fc5c184..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json
deleted file mode 100644
index 5bc67f79251..00000000000
--- a/keyboards/wilba_tech/rama_works_m65_b/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "keyboard_name": "M65-B",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x065B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
-    },
-    "community_layouts": [
-        "65_ansi_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_m65_b/keyboard.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
new file mode 100644
index 00000000000..156affff7da
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "M65-B",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x065B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+    },
+    "community_layouts": [
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json
deleted file mode 100644
index 113dae991ba..00000000000
--- a/keyboards/wilba_tech/rama_works_m65_bx/info.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-    "keyboard_name": "M65-BX",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x165B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
-    },
-    "community_layouts": [
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
new file mode 100644
index 00000000000..9b4edcc6efc
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
@@ -0,0 +1,184 @@
+{
+    "keyboard_name": "M65-BX",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x165B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+    },
+    "community_layouts": [
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json
deleted file mode 100644
index 73091d30363..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "keyboard_name": "M6-A",
-  "manufacturer": "RAMA WORKS",
-  "url": "http://rama.works",
-  "maintainer": "Wilba",
-  "usb": {
-    "vid": "0x5241",
-    "pid": "0x006A",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
-    "rows": ["E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [0, 3], "x": 0, "y": 1},
-        {"matrix": [0, 4], "x": 1, "y": 1},
-        {"matrix": [0, 5], "x": 2, "y": 1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keyboard.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
new file mode 100644
index 00000000000..df7fc90a962
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
@@ -0,0 +1,37 @@
+{
+  "keyboard_name": "M6-A",
+  "manufacturer": "RAMA WORKS",
+  "url": "http://rama.works",
+  "maintainer": "Wilba",
+  "usb": {
+    "vid": "0x5241",
+    "pid": "0x006A",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1},
+        {"matrix": [0, 4], "x": 1, "y": 1},
+        {"matrix": [0, 5], "x": 2, "y": 1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
index 95303152b9b..806a82e12af 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
@@ -2,16 +2,3 @@
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json
deleted file mode 100644
index 4356011aae1..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "keyboard_name": "M6-B",
-  "manufacturer": "RAMA WORKS",
-  "url": "http://rama.works",
-  "maintainer": "Wilba",
-  "usb": {
-    "vid": "0x5241",
-    "pid": "0x006B",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
-    "rows": ["E6"]
-  },
-  "diode_direction": "COL2ROW",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-
-        {"matrix": [0, 3], "x": 0, "y": 1},
-        {"matrix": [0, 4], "x": 1, "y": 1},
-        {"matrix": [0, 5], "x": 2, "y": 1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/keyboard.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
new file mode 100644
index 00000000000..4d258b826b9
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
@@ -0,0 +1,37 @@
+{
+  "keyboard_name": "M6-B",
+  "manufacturer": "RAMA WORKS",
+  "url": "http://rama.works",
+  "maintainer": "Wilba",
+  "usb": {
+    "vid": "0x5241",
+    "pid": "0x006B",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true
+  },
+  "matrix_pins": {
+    "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+    "rows": ["E6"]
+  },
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [0, 3], "x": 0, "y": 1},
+        {"matrix": [0, 4], "x": 1, "y": 1},
+        {"matrix": [0, 5], "x": 2, "y": 1}
+      ]
+    }
+  }
+}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
index eff0605d909..4650d7a6ea2 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3218.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json
deleted file mode 100644
index 96349f39093..00000000000
--- a/keyboards/wilba_tech/rama_works_u80_a/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "keyboard_name": "U80-A",
-    "manufacturer": "RAMA WORKS",
-    "url": "http://rama.works",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5241",
-        "pid": "0x080A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
-    },
-    "community_layouts": [
-        "tkl_ansi_tsangan"
-    ],
-    "layouts": {
-        "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": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/rama_works_u80_a/keyboard.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
new file mode 100644
index 00000000000..bf06d9508f2
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
@@ -0,0 +1,135 @@
+{
+    "keyboard_name": "U80-A",
+    "manufacturer": "RAMA WORKS",
+    "url": "http://rama.works",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5241",
+        "pid": "0x080A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_ansi_tsangan"
+    ],
+    "layouts": {
+        "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": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
index b2629858808..d6df34b9bc0 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
@@ -1,19 +1,8 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/via_test.c b/keyboards/wilba_tech/via_test.c
index 6a74df51643..314ec4472c3 100644
--- a/keyboards/wilba_tech/via_test.c
+++ b/keyboards/wilba_tech/via_test.c
@@ -14,7 +14,6 @@
 // - add `#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 128` to config.h
 //   (or change to match CHANNELS*VALUES*2)
 
-#include "quantum.h"
 #include "via.h"
 
 #ifdef VIA_ENABLE
diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json
deleted file mode 100644
index 6016905bdc3..00000000000
--- a/keyboards/wilba_tech/wt60_a/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-    "keyboard_name": "WT60-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x060A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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/wilba_tech/wt60_a/keyboard.json b/keyboards/wilba_tech/wt60_a/keyboard.json
new file mode 100644
index 00000000000..1c6d9f8c35d
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_a/keyboard.json
@@ -0,0 +1,166 @@
+{
+    "keyboard_name": "WT60-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x060A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt60_a/rules.mk
+++ b/keyboards/wilba_tech/wt60_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json
deleted file mode 100644
index 253c081b9aa..00000000000
--- a/keyboards/wilba_tech/wt60_b/info.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-    "keyboard_name": "WT60-B",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x60B0",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_tsangan_hhkb",
-        "60_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Ctrl", "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": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Control", "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": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt60_b/keyboard.json b/keyboards/wilba_tech/wt60_b/keyboard.json
new file mode 100644
index 00000000000..765ba96f61f
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_b/keyboard.json
@@ -0,0 +1,171 @@
+{
+    "keyboard_name": "WT60-B",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x60B0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Ctrl", "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": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Control", "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": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_b/rules.mk
+++ b/keyboards/wilba_tech/wt60_b/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json
deleted file mode 100644
index 1978ce8a4f1..00000000000
--- a/keyboards/wilba_tech/wt60_bx/info.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-    "keyboard_name": "WT60-BX",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x60B1",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_tsangan_hhkb",
-        "60_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_ansi_tsangan_split_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Ctrl", "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": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Ctrl", "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": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt60_bx/keyboard.json b/keyboards/wilba_tech/wt60_bx/keyboard.json
new file mode 100644
index 00000000000..6b4b6e9fb18
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_bx/keyboard.json
@@ -0,0 +1,240 @@
+{
+    "keyboard_name": "WT60-BX",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x60B1",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan_split_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Ctrl", "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": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Ctrl", "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": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_bx/rules.mk
+++ b/keyboards/wilba_tech/wt60_bx/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json
deleted file mode 100644
index 652714f52af..00000000000
--- a/keyboards/wilba_tech/wt60_c/info.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-    "keyboard_name": "WT60-C",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x60C0",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": [
-        "60_tsangan_hhkb",
-        "60_hhkb"
-    ],
-    "layouts": {
-        "LAYOUT_60_ansi_tsangan_split_rshift": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"label": "Control", "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": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt60_c/keyboard.json b/keyboards/wilba_tech/wt60_c/keyboard.json
new file mode 100644
index 00000000000..569cca93b75
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_c/keyboard.json
@@ -0,0 +1,240 @@
+{
+    "keyboard_name": "WT60-C",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x60C0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": [
+        "60_tsangan_hhkb",
+        "60_hhkb"
+    ],
+    "layouts": {
+        "LAYOUT_60_ansi_tsangan_split_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Control", "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": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_c/rules.mk
+++ b/keyboards/wilba_tech/wt60_c/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json
deleted file mode 100644
index 1957c88dd2f..00000000000
--- a/keyboards/wilba_tech/wt65_a/info.json
+++ /dev/null
@@ -1,332 +0,0 @@
-{
-    "keyboard_name": "WT65-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x065A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
-    },
-    "community_layouts": [
-        "65_ansi_blocker",
-        "65_ansi_blocker_split_bs",
-        "65_ansi_blocker_tsangan",
-        "65_ansi_blocker_tsangan_split_bs"
-    ],
-    "layouts": {
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt65_a/keyboard.json b/keyboards/wilba_tech/wt65_a/keyboard.json
new file mode 100644
index 00000000000..ec87e830f07
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_a/keyboard.json
@@ -0,0 +1,338 @@
+{
+    "keyboard_name": "WT65-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x065A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+    },
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs"
+    ],
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt65_a/rules.mk
+++ b/keyboards/wilba_tech/wt65_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json
deleted file mode 100644
index 10de33b143b..00000000000
--- a/keyboards/wilba_tech/wt65_b/info.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-    "keyboard_name": "WT65-B",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x065B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker_wkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_blocker_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_wkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt65_b/keyboard.json b/keyboards/wilba_tech/wt65_b/keyboard.json
new file mode 100644
index 00000000000..56f71f3fc11
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_b/keyboard.json
@@ -0,0 +1,177 @@
+{
+    "keyboard_name": "WT65-B",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x065B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_wkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_wkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt65_b/rules.mk
+++ b/keyboards/wilba_tech/wt65_b/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json
deleted file mode 100644
index bd93286a0f1..00000000000
--- a/keyboards/wilba_tech/wt69_a/info.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "keyboard_name": "WT69-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x069A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_xt_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
-            ]
-        },
-        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
-                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
-                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
-                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
-                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
-                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
-                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
-                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
-                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
-                {"label": "Backspace", "matrix": [2, 15], "x": 16.25, "y": 0},
-                {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
-                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
-                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
-                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
-                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
-                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
-                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
-                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
-                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
-                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
-                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
-                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
-                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
-                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
-
-                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
-                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
-                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
-                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
-                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
-                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
-                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
-                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
-                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
-                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
-                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
-                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
-                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
-
-                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
-                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
-                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
-                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
-                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
-                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
-                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
-                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
-                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
-                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
-                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
-                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
-                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
-                {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
-
-                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
-                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
-                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
-                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
-                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
-                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
-                {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
-                {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
-                {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt69_a/keyboard.json b/keyboards/wilba_tech/wt69_a/keyboard.json
new file mode 100644
index 00000000000..8321ae86c40
--- /dev/null
+++ b/keyboards/wilba_tech/wt69_a/keyboard.json
@@ -0,0 +1,204 @@
+{
+    "keyboard_name": "WT69-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x069A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+                {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+                {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+                {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+                {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+                {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+                {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+                {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "Backspace", "matrix": [2, 15], "x": 16.25, "y": 0},
+                {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+                {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+                {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+                {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
+
+                {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+                {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+                {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+                {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+                {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+                {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+                {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
+
+                {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+                {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+                {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+                {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+                {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+                {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+                {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+                {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+                {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
+                {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
+
+                {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
+                {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
+                {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk
index 396da8c7344..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt69_a/rules.mk
+++ b/keyboards/wilba_tech/wt69_a/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json
deleted file mode 100644
index 5cbb6f1f8b6..00000000000
--- a/keyboards/wilba_tech/wt75_a/info.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
-    "keyboard_name": "WT75-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x075A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
-
-                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
-                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
-                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt75_a/keyboard.json b/keyboards/wilba_tech/wt75_a/keyboard.json
new file mode 100644
index 00000000000..609dff0c36f
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_a/keyboard.json
@@ -0,0 +1,394 @@
+{
+    "keyboard_name": "WT75-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x075A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+
+                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
+                {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+                {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_a/rules.mk
+++ b/keyboards/wilba_tech/wt75_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json
deleted file mode 100644
index c0e996e0018..00000000000
--- a/keyboards/wilba_tech/wt75_b/info.json
+++ /dev/null
@@ -1,392 +0,0 @@
-{
-    "keyboard_name": "WT75-B",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x075B",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_75_ansi_blocker_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_75_ansi_blocker": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_blocker_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
-                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_blocker_tsangan": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
-                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_ansi_blocker_tsangan_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
-                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
-                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt75_b/keyboard.json b/keyboards/wilba_tech/wt75_b/keyboard.json
new file mode 100644
index 00000000000..15bc61e9236
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_b/keyboard.json
@@ -0,0 +1,398 @@
+{
+    "keyboard_name": "WT75-B",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x075B",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_75_ansi_blocker_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
+                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
+                {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_b/rules.mk
+++ b/keyboards/wilba_tech/wt75_b/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json
deleted file mode 100644
index daa6303fb96..00000000000
--- a/keyboards/wilba_tech/wt75_c/info.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
-    "keyboard_name": "WT75-C",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x075C",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_ansi_rwkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_ansi_rwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-                {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-                {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-                {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-                {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_ansi_rwkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
-
-                {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
-                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
-                {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt75_c/keyboard.json b/keyboards/wilba_tech/wt75_c/keyboard.json
new file mode 100644
index 00000000000..38d1450ae09
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_c/keyboard.json
@@ -0,0 +1,217 @@
+{
+    "keyboard_name": "WT75-C",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x075C",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_rwkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_ansi_rwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_rwkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_c/rules.mk
+++ b/keyboards/wilba_tech/wt75_c/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json
deleted file mode 100644
index 570b3dc03af..00000000000
--- a/keyboards/wilba_tech/wt80_a/info.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
-    "keyboard_name": "WT80-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x080A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
-        "LAYOUT_no_split": "LAYOUT_tkl_ansi"
-    },
-    "layouts": {
-        "LAYOUT_tkl_ansi_split_bs_rshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5},
-                {"matrix": [3, 13], "x": 14, "y": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt80_a/keyboard.json b/keyboards/wilba_tech/wt80_a/keyboard.json
new file mode 100644
index 00000000000..d7d6d11882e
--- /dev/null
+++ b/keyboards/wilba_tech/wt80_a/keyboard.json
@@ -0,0 +1,241 @@
+{
+    "keyboard_name": "WT80-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x080A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
+        "LAYOUT_no_split": "LAYOUT_tkl_ansi"
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5},
+                {"matrix": [3, 13], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt80_a/rules.mk
+++ b/keyboards/wilba_tech/wt80_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	drivers/led/issi/is31fl3736-mono.c \
 		quantum/color.c \
 		keyboards/wilba_tech/wt_mono_backlight.c \
 		keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
deleted file mode 100644
index 9541b1df126..00000000000
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json
deleted file mode 100644
index b76e9cf86ce..00000000000
--- a/keyboards/wilba_tech/wt80_bc/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "keyboard_name": "WT80-BC",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x80B0",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
-        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
-    },
-    "community_layouts": [
-        "tkl_ansi_tsangan"
-    ],
-    "layouts": {
-        "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": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        },
-        "LAYOUT_tkl_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
-                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
-                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
-                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
-                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
-                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
-                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
-                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
-                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
-                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
-                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
-                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt80_bc/keyboard.json b/keyboards/wilba_tech/wt80_bc/keyboard.json
new file mode 100644
index 00000000000..072b965aefe
--- /dev/null
+++ b/keyboards/wilba_tech/wt80_bc/keyboard.json
@@ -0,0 +1,242 @@
+{
+    "keyboard_name": "WT80-BC",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x80B0",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+        "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
+    },
+    "community_layouts": [
+        "tkl_ansi_tsangan"
+    ],
+    "layouts": {
+        "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": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk
index 5b8a8888456..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt80_bc/rules.mk
+++ b/keyboards/wilba_tech/wt80_bc/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
deleted file mode 100644
index 1377a18714c..00000000000
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json
deleted file mode 100644
index a07707d7897..00000000000
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "keyboard_name": "WT8-A",
-    "manufacturer": "wilba.tech",
-    "url": "https://wilba.tech",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x6582",
-        "pid": "0x008A",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
-        "rows": ["E6"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-
-                {"matrix": [0, 4], "x": 0, "y": 1},
-                {"matrix": [0, 5], "x": 1, "y": 1},
-                {"matrix": [0, 6], "x": 2, "y": 1},
-                {"matrix": [0, 7], "x": 3, "y": 1}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/wt8_a/keyboard.json b/keyboards/wilba_tech/wt8_a/keyboard.json
new file mode 100644
index 00000000000..a84ff6a33f9
--- /dev/null
+++ b/keyboards/wilba_tech/wt8_a/keyboard.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "WT8-A",
+    "manufacturer": "wilba.tech",
+    "url": "https://wilba.tech",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x6582",
+        "pid": "0x008A",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [0, 4], "x": 0, "y": 1},
+                {"matrix": [0, 5], "x": 1, "y": 1},
+                {"matrix": [0, 6], "x": 2, "y": 1},
+                {"matrix": [0, 7], "x": 3, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk
index 396da8c7344..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt8_a/rules.mk
+++ b/keyboards/wilba_tech/wt8_a/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no           # Audio output
-
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 1523fbdb853..1426e09fc6f 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -14,16 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "wt_mono_backlight.h"
 #include "wt_rgb_backlight_api.h" // reuse these for now
 #include "wt_rgb_backlight_keycodes.h" // reuse these for now
 
+#include <stdlib.h>
 #include <avr/interrupt.h>
 #include "i2c_master.h"
-
+#include "host.h"
 #include "progmem.h"
-#include "quantum/color.h"
 #include "eeprom.h"
 
 #include "via.h" // uses EEPROM address, lighting value IDs
diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h
index 9bf76b44bb8..fb77ec66e19 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.h
+++ b/keyboards/wilba_tech/wt_mono_backlight.h
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "action.h"
 #include "quantum/color.h"
 
 typedef struct PACKED
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index d03d189b298..02bcdd610be 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -40,19 +40,15 @@
 #error wt_rgb_backlight.c compiled without setting configuration symbol
 #endif
 
-#ifndef MAX
-    #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-
-#ifndef MIN
-    #define MIN(a,b) ((a) < (b)? (a): (b))
-#endif
-
-#include "quantum.h"
 #include "wt_rgb_backlight.h"
 #include "wt_rgb_backlight_api.h"
 #include "wt_rgb_backlight_keycodes.h"
 
+#include <stdlib.h>
+#include "quantum.h"
+#include "host.h"
+#include "util.h"
+
 #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA)
 #include <avr/interrupt.h>
 #include "i2c_master.h"
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h
index 6fb2ee21220..56621781978 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "action.h"
 #include "quantum/color.h"
 
 typedef struct PACKED
diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
index b8c23c4b073..79016744af9 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include "keycodes.h"
+
 enum wt_rgb_backlight_keycodes {
     BR_INC = QK_KB_0, // brightness increase
     BR_DEC,             // brightness decrease
diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json
deleted file mode 100644
index 295d11c0696..00000000000
--- a/keyboards/wilba_tech/zeal60/info.json
+++ /dev/null
@@ -1,371 +0,0 @@
-{
-    "keyboard_name": "Zeal60",
-    "manufacturer": "ZealPC",
-    "url": "https://zealpc.net",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5A45",
-        "pid": "0x0060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
-    "layouts": {
-        "LAYOUT_60_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-
-                {"matrix": [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": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/zeal60/keyboard.json b/keyboards/wilba_tech/zeal60/keyboard.json
new file mode 100644
index 00000000000..34f7a312aaf
--- /dev/null
+++ b/keyboards/wilba_tech/zeal60/keyboard.json
@@ -0,0 +1,377 @@
+{
+    "keyboard_name": "Zeal60",
+    "manufacturer": "ZealPC",
+    "url": "https://zealpc.net",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5A45",
+        "pid": "0x0060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+
+                {"matrix": [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": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.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, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk
index d1ce11b473c..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/zeal60/rules.mk
+++ b/keyboards/wilba_tech/zeal60/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json
deleted file mode 100644
index 814ea28660e..00000000000
--- a/keyboards/wilba_tech/zeal65/info.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "keyboard_name": "Zeal65",
-    "manufacturer": "ZealPC",
-    "url": "https://zealpc.net",
-    "maintainer": "Wilba",
-    "usb": {
-        "vid": "0x5A45",
-        "pid": "0x0065",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["F0", "F1", "F4", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_65_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_normie": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wilba_tech/zeal65/keyboard.json b/keyboards/wilba_tech/zeal65/keyboard.json
new file mode 100644
index 00000000000..2bc5e65b7b2
--- /dev/null
+++ b/keyboards/wilba_tech/zeal65/keyboard.json
@@ -0,0 +1,175 @@
+{
+    "keyboard_name": "Zeal65",
+    "manufacturer": "ZealPC",
+    "url": "https://zealpc.net",
+    "maintainer": "Wilba",
+    "usb": {
+        "vid": "0x5A45",
+        "pid": "0x0065",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_65_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_normie": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk
index d1ce11b473c..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/zeal65/rules.mk
+++ b/keyboards/wilba_tech/zeal65/rules.mk
@@ -3,24 +3,11 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 
 # project specific files
 SRC =	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/keyboard.json
similarity index 100%
rename from keyboards/wolf/frogpad/info.json
rename to keyboards/wolf/frogpad/keyboard.json
diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json
deleted file mode 100644
index e088a5b7779..00000000000
--- a/keyboards/wolf/kuku65/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "keyboard_name": "kuku65",
-    "manufacturer": "ToastyStoemp",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x5453",
-        "pid": "0x0052",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
-        "rows": ["B3", "B2", "B1", "B0", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wolf/kuku65/keyboard.json b/keyboards/wolf/kuku65/keyboard.json
new file mode 100644
index 00000000000..5146d77d1b5
--- /dev/null
+++ b/keyboards/wolf/kuku65/keyboard.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "kuku65",
+    "manufacturer": "ToastyStoemp",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x5453",
+        "pid": "0x0052",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+        "rows": ["B3", "B2", "B1", "B0", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk
index 67bb6296514..3437a35bdf1 100644
--- a/keyboards/wolf/kuku65/rules.mk
+++ b/keyboards/wolf/kuku65/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/keyboard.json
similarity index 100%
rename from keyboards/wolf/m60_b/info.json
rename to keyboards/wolf/m60_b/keyboard.json
diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/keyboard.json
similarity index 100%
rename from keyboards/wolf/m6_c/info.json
rename to keyboards/wolf/m6_c/keyboard.json
diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/keyboard.json
similarity index 100%
rename from keyboards/wolf/neely65/info.json
rename to keyboards/wolf/neely65/keyboard.json
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json
deleted file mode 100644
index 1e7702a3401..00000000000
--- a/keyboards/wolf/ryujin/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Ryujin",
-    "manufacturer": "Miroticaps",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x5453",
-        "pid": "0x0200",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["D5", "D3", "D2", "D1", "D0"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wolf/ryujin/keyboard.json b/keyboards/wolf/ryujin/keyboard.json
new file mode 100644
index 00000000000..8e72cccd9e9
--- /dev/null
+++ b/keyboards/wolf/ryujin/keyboard.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Ryujin",
+    "manufacturer": "Miroticaps",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x5453",
+        "pid": "0x0200",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk
index 67bb6296514..3437a35bdf1 100644
--- a/keyboards/wolf/ryujin/rules.mk
+++ b/keyboards/wolf/ryujin/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
deleted file mode 100644
index 1be6824d09e..00000000000
--- a/keyboards/wolf/sabre/info.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-    "keyboard_name": "Sabre",
-    "manufacturer": "ToastyStoemp",
-    "url": "",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x5453",
-        "pid": "0x0055",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
-        "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "B3",
-        "scroll_lock": "B0",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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": [1, 3], "x": 8.75, "y": 0},
-                {"matrix": [0, 4], "x": 9.75, "y": 0},
-                {"matrix": [1, 4], "x": 10.75, "y": 0},
-                {"matrix": [0, 5], "x": 11.75, "y": 0},
-
-                {"matrix": [1, 5], "x": 13, "y": 0},
-                {"matrix": [0, 6], "x": 14, "y": 0},
-                {"matrix": [1, 6], "x": 15, "y": 0},
-                {"matrix": [0, 7], "x": 16, "y": 0},
-
-                {"matrix": [1, 7], "x": 17.25, "y": 0},
-                {"matrix": [0, 8], "x": 18.25, "y": 0},
-                {"matrix": [1, 8], "x": 19.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-
-                {"matrix": [3, 3], "x": 9, "y": 1.25},
-                {"matrix": [2, 4], "x": 10, "y": 1.25},
-                {"matrix": [3, 4], "x": 11, "y": 1.25},
-                {"matrix": [2, 5], "x": 12, "y": 1.25},
-                {"matrix": [3, 5], "x": 13, "y": 1.25},
-                {"matrix": [2, 6], "x": 14, "y": 1.25},
-                {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2},
-
-                {"matrix": [3, 7], "x": 17.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 18.25, "y": 1.25},
-                {"matrix": [3, 8], "x": 19.25, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
-                {"matrix": [4, 3], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 13.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 14.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [5, 7], "x": 17.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 18.25, "y": 2.25},
-                {"matrix": [5, 8], "x": 19.25, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-
-                {"matrix": [6, 3], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 11.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 12.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 13.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
-
-                {"matrix": [8, 3], "x": 8.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 9.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 10.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
-                {"matrix": [9, 5], "x": 13.25, "y": 4.25},
-                {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
-                {"matrix": [9, 6], "x": 16, "y": 4.25},
-
-                {"matrix": [8, 8], "x": 18.25, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 1], "x": 4, "y": 5.25},
-                {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25},
-
-                {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75},
-                {"matrix": [11, 4], "x": 11, "y": 5.25},
-                {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5},
-                {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [11, 7], "x": 17.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 18.25, "y": 5.25},
-                {"matrix": [11, 8], "x": 19.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wolf/sabre/keyboard.json b/keyboards/wolf/sabre/keyboard.json
new file mode 100644
index 00000000000..11b235efe7a
--- /dev/null
+++ b/keyboards/wolf/sabre/keyboard.json
@@ -0,0 +1,146 @@
+{
+    "keyboard_name": "Sabre",
+    "manufacturer": "ToastyStoemp",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x5453",
+        "pid": "0x0055",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
+        "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "scroll_lock": "B0",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [1, 3], "x": 8.75, "y": 0},
+                {"matrix": [0, 4], "x": 9.75, "y": 0},
+                {"matrix": [1, 4], "x": 10.75, "y": 0},
+                {"matrix": [0, 5], "x": 11.75, "y": 0},
+
+                {"matrix": [1, 5], "x": 13, "y": 0},
+                {"matrix": [0, 6], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
+                {"matrix": [0, 7], "x": 16, "y": 0},
+
+                {"matrix": [1, 7], "x": 17.25, "y": 0},
+                {"matrix": [0, 8], "x": 18.25, "y": 0},
+                {"matrix": [1, 8], "x": 19.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+
+                {"matrix": [3, 3], "x": 9, "y": 1.25},
+                {"matrix": [2, 4], "x": 10, "y": 1.25},
+                {"matrix": [3, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 5], "x": 12, "y": 1.25},
+                {"matrix": [3, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 6], "x": 14, "y": 1.25},
+                {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 18.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [4, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 13.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 14.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 17.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 18.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+
+                {"matrix": [6, 3], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+
+                {"matrix": [8, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 13.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 16, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 18.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 4, "y": 5.25},
+                {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 4], "x": 11, "y": 5.25},
+                {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 19.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk
index e7cc37d18d6..3437a35bdf1 100644
--- a/keyboards/wolf/sabre/rules.mk
+++ b/keyboards/wolf/sabre/rules.mk
@@ -1,16 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
deleted file mode 100644
index 8f6d9318ea5..00000000000
--- a/keyboards/wolf/ts60/info.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-    "keyboard_name": "TS60",
-    "manufacturer": "ToastyStoemp",
-    "url": "https://www.vwolf.be/",
-    "maintainer": "ToastyStoemp",
-    "usb": {
-        "vid": "0x5453",
-        "pid": "0x0050",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
-        "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 6
-    },
-    "rgblight": {
-        "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
-        },
-        "default": {
-            "animation": "rainbow_swirl"
-        }
-    },
-    "ws2812": {
-        "pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT": {
-            "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": [0, 7], "x": 13, "y": 0},
-                {"matrix": [1, 7], "x": 14, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [3, 1], "x": 2.5, "y": 1},
-                {"matrix": [2, 2], "x": 3.5, "y": 1},
-                {"matrix": [3, 2], "x": 4.5, "y": 1},
-                {"matrix": [2, 3], "x": 5.5, "y": 1},
-                {"matrix": [3, 3], "x": 6.5, "y": 1},
-                {"matrix": [2, 4], "x": 7.5, "y": 1},
-                {"matrix": [3, 4], "x": 8.5, "y": 1},
-                {"matrix": [2, 5], "x": 9.5, "y": 1},
-                {"matrix": [3, 5], "x": 10.5, "y": 1},
-                {"matrix": [2, 6], "x": 11.5, "y": 1},
-                {"matrix": [2, 7], "x": 12.5, "y": 1},
-                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-                {"matrix": [6, 1], "x": 2, "y": 3},
-                {"matrix": [7, 1], "x": 3, "y": 3},
-                {"matrix": [6, 2], "x": 4, "y": 3},
-                {"matrix": [7, 2], "x": 5, "y": 3},
-                {"matrix": [6, 3], "x": 6, "y": 3},
-                {"matrix": [7, 3], "x": 7, "y": 3},
-                {"matrix": [6, 4], "x": 8, "y": 3},
-                {"matrix": [7, 4], "x": 9, "y": 3},
-                {"matrix": [6, 5], "x": 10, "y": 3},
-                {"matrix": [7, 5], "x": 11, "y": 3},
-                {"matrix": [6, 6], "x": 12, "y": 3},
-                {"matrix": [6, 7], "x": 13, "y": 3},
-                {"matrix": [7, 7], "x": 14, "y": 3},
-
-                {"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, 2], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [8, 5], "x": 10, "y": 4},
-                {"matrix": [9, 5], "x": 11, "y": 4},
-                {"matrix": [8, 6], "x": 12, "y": 4},
-                {"matrix": [8, 7], "x": 13, "y": 4},
-                {"matrix": [9, 7], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi": {
-            "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": [0, 7], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 1},
-                {"matrix": [3, 1], "x": 2.5, "y": 1},
-                {"matrix": [2, 2], "x": 3.5, "y": 1},
-                {"matrix": [3, 2], "x": 4.5, "y": 1},
-                {"matrix": [2, 3], "x": 5.5, "y": 1},
-                {"matrix": [3, 3], "x": 6.5, "y": 1},
-                {"matrix": [2, 4], "x": 7.5, "y": 1},
-                {"matrix": [3, 4], "x": 8.5, "y": 1},
-                {"matrix": [2, 5], "x": 9.5, "y": 1},
-                {"matrix": [3, 5], "x": 10.5, "y": 1},
-                {"matrix": [2, 6], "x": 11.5, "y": 1},
-                {"matrix": [2, 7], "x": 12.5, "y": 1},
-                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 2},
-                {"matrix": [5, 1], "x": 2.75, "y": 2},
-                {"matrix": [4, 2], "x": 3.75, "y": 2},
-                {"matrix": [5, 2], "x": 4.75, "y": 2},
-                {"matrix": [4, 3], "x": 5.75, "y": 2},
-                {"matrix": [5, 3], "x": 6.75, "y": 2},
-                {"matrix": [4, 4], "x": 7.75, "y": 2},
-                {"matrix": [5, 4], "x": 8.75, "y": 2},
-                {"matrix": [4, 5], "x": 9.75, "y": 2},
-                {"matrix": [5, 5], "x": 10.75, "y": 2},
-                {"matrix": [4, 6], "x": 11.75, "y": 2},
-                {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 7], "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": [8, 5], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wolf/ts60/keyboard.json b/keyboards/wolf/ts60/keyboard.json
new file mode 100644
index 00000000000..ff5059f2f1c
--- /dev/null
+++ b/keyboards/wolf/ts60/keyboard.json
@@ -0,0 +1,200 @@
+{
+    "keyboard_name": "TS60",
+    "manufacturer": "ToastyStoemp",
+    "url": "https://www.vwolf.be/",
+    "maintainer": "ToastyStoemp",
+    "usb": {
+        "vid": "0x5453",
+        "pid": "0x0050",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
+        "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 6
+    },
+    "rgblight": {
+        "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
+        },
+        "default": {
+            "animation": "rainbow_swirl"
+        }
+    },
+    "ws2812": {
+        "pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT": {
+            "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": [0, 7], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 5], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [2, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [6, 7], "x": 13, "y": 3},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+
+                {"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, 2], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [8, 5], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4},
+                {"matrix": [8, 6], "x": 12, "y": 4},
+                {"matrix": [8, 7], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "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": [0, 7], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 1},
+                {"matrix": [3, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [3, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [2, 5], "x": 9.5, "y": 1},
+                {"matrix": [3, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [2, 7], "x": 12.5, "y": 1},
+                {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 7], "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": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk
index fb26dc7de5f..3437a35bdf1 100644
--- a/keyboards/wolf/ts60/rules.mk
+++ b/keyboards/wolf/ts60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
deleted file mode 100644
index 4b007cf387e..00000000000
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
deleted file mode 100644
index 04b8ae3b115..00000000000
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "keyboard_name": "WM1",
-    "manufacturer": "Wolfmark Club",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x2B29",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "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": "A3"
-    },
-    "matrix_pins": {
-        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
-        "rows": ["C4", "A7", "A6", "A5", "A4"]
-    },
-    "diode_direction": "COL2ROW",
-    "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": 8.75, "y": 0},
-                {"matrix": [0, 8], "x": 9.75, "y": 0},
-                {"matrix": [0, 9], "x": 10.75, "y": 0},
-                {"matrix": [0, 10], "x": 11.75, "y": 0},
-                {"matrix": [0, 11], "x": 12.75, "y": 0},
-                {"matrix": [0, 12], "x": 13.75, "y": 0},
-                {"matrix": [0, 13], "x": 14.75, "y": 0},
-                {"matrix": [0, 14], "x": 15.75, "y": 0},
-
-                {"matrix": [2, 13], "x": 17, "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": 8.25, "y": 1},
-                {"matrix": [1, 7], "x": 9.25, "y": 1},
-                {"matrix": [1, 8], "x": 10.25, "y": 1},
-                {"matrix": [1, 9], "x": 11.25, "y": 1},
-                {"matrix": [1, 10], "x": 12.25, "y": 1},
-                {"matrix": [1, 11], "x": 13.25, "y": 1},
-                {"matrix": [1, 12], "x": 14.25, "y": 1},
-                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 17, "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": 8.5, "y": 2},
-                {"matrix": [2, 7], "x": 9.5, "y": 2},
-                {"matrix": [2, 8], "x": 10.5, "y": 2},
-                {"matrix": [2, 9], "x": 11.5, "y": 2},
-                {"matrix": [2, 10], "x": 12.5, "y": 2},
-                {"matrix": [2, 11], "x": 13.5, "y": 2},
-                {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 14], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [3, 6], "x": 8, "y": 3},
-                {"matrix": [3, 7], "x": 9, "y": 3},
-                {"matrix": [3, 8], "x": 10, "y": 3},
-                {"matrix": [3, 9], "x": 11, "y": 3},
-                {"matrix": [3, 10], "x": 12, "y": 3},
-                {"matrix": [3, 11], "x": 13, "y": 3},
-                {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75},
-
-                {"matrix": [3, 14], "x": 16.25, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
-                {"matrix": [4, 5], "x": 6.5, "y": 4},
-                {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
-                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wolfmarkclub/wm1/keyboard.json b/keyboards/wolfmarkclub/wm1/keyboard.json
new file mode 100644
index 00000000000..56c062e1024
--- /dev/null
+++ b/keyboards/wolfmarkclub/wm1/keyboard.json
@@ -0,0 +1,146 @@
+{
+    "keyboard_name": "WM1",
+    "manufacturer": "Wolfmark Club",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x2B29",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "sleep_led": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "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": "A3"
+    },
+    "matrix_pins": {
+        "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
+        "rows": ["C4", "A7", "A6", "A5", "A4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F103",
+    "bootloader": "custom",
+    "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": 8.75, "y": 0},
+                {"matrix": [0, 8], "x": 9.75, "y": 0},
+                {"matrix": [0, 9], "x": 10.75, "y": 0},
+                {"matrix": [0, 10], "x": 11.75, "y": 0},
+                {"matrix": [0, 11], "x": 12.75, "y": 0},
+                {"matrix": [0, 12], "x": 13.75, "y": 0},
+                {"matrix": [0, 13], "x": 14.75, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+                {"matrix": [2, 13], "x": 17, "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": 8.25, "y": 1},
+                {"matrix": [1, 7], "x": 9.25, "y": 1},
+                {"matrix": [1, 8], "x": 10.25, "y": 1},
+                {"matrix": [1, 9], "x": 11.25, "y": 1},
+                {"matrix": [1, 10], "x": 12.25, "y": 1},
+                {"matrix": [1, 11], "x": 13.25, "y": 1},
+                {"matrix": [1, 12], "x": 14.25, "y": 1},
+                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 17, "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": 8.5, "y": 2},
+                {"matrix": [2, 7], "x": 9.5, "y": 2},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 14], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 6.5, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 512ef119fdb..63ba3477c3c 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -1,27 +1,5 @@
-# MCU name
-MCU = STM32F103
-
 # GENERIC STM32F103C8T6 board - mass storage bootloader
 MCU_LDSCRIPT = wm1_f103
 BOARD = STM32_F103_STM32DUINO
 
-# Bootloader selection
-BOOTLOADER = custom
-
 PROGRAM_CMD = echo 'CLI flashing not supported' >&2
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SLEEP_LED_ENABLE = yes
-LTO_ENABLE = yes
-
diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/info.json
deleted file mode 100644
index 2ce28918df5..00000000000
--- a/keyboards/woodkeys/meira/featherble/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "bluetooth": {
-        "driver": "bluefruit_le"
-    }
-}
diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json
new file mode 100644
index 00000000000..8dc946dd571
--- /dev/null
+++ b/keyboards/woodkeys/meira/featherble/keyboard.json
@@ -0,0 +1,7 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "bluetooth": {
+        "driver": "bluefruit_le"
+    }
+}
diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json
index 5fbcc9deafc..3ad2918d8e6 100644
--- a/keyboards/woodkeys/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
@@ -8,8 +8,9 @@
         "pid": "0x6061",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "features": {
+        "extrakey": true
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },
diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c
index 8aedffc675f..72f465e44ac 100644
--- a/keyboards/woodkeys/meira/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c
@@ -182,7 +182,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
                 PLAY_SONG(tone_qwerty);
 #endif
-                //        persistent_default_layer_set(1UL<<_QWERTY);
             }
             return false;
             break;
@@ -191,7 +190,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
                 PLAY_SONG(tone_colemak);
 #endif
-                //        persistent_default_layer_set(1UL<<_COLEMAK);
             }
             return false;
             break;
@@ -200,7 +198,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
                 PLAY_SONG(tone_dvorak);
 #endif
-                //        persistent_default_layer_set(1UL<<_DVORAK);
             }
             return false;
             break;
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index cf1b2b8ce69..bba1b5583ee 100644
--- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
@@ -26,8 +26,7 @@ extern rgblight_config_t rgblight_config;
 #define _ADJUST 3
 
 enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
+  LOWER = SAFE_RANGE,
   RAISE,
   ADJUST,
 };
@@ -104,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          */
         [_ADJUST] =  LAYOUT(
                 BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
-                BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______,
+                BL_STEP, RGB_MOD, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______,  _______, _______,
                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                 _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
         )
@@ -124,15 +123,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-//        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
     case LOWER:
         if (record->event.pressed) {
             //not sure how to have keyboard check mode and set it to a variable, so my work around
diff --git a/keyboards/woodkeys/meira/promicro/keyboard.json b/keyboards/woodkeys/meira/promicro/keyboard.json
new file mode 100644
index 00000000000..4c44b1c5bf9
--- /dev/null
+++ b/keyboards/woodkeys/meira/promicro/keyboard.json
@@ -0,0 +1,3 @@
+{
+    "development_board": "promicro"
+}
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
index bad7949ec0d..423c14cfb73 100644
--- a/keyboards/woodkeys/meira/rules.mk
+++ b/keyboards/woodkeys/meira/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = yes
 SRC += matrix.c
 
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json
similarity index 100%
rename from keyboards/work_louder/micro/info.json
rename to keyboards/work_louder/micro/keyboard.json
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
deleted file mode 100644
index 61c48b3e802..00000000000
--- a/keyboards/work_louder/nano/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Nano Pad",
-    "manufacturer": "Work Louder",
-    "url": "https://worklouder.cc/",
-    "maintainer": "Work Louder",
-    "usb": {
-        "vid": "0x574C",
-        "pid": "0xE6F0",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "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
-        },
-        "driver": "ws2812",
-        "max_brightness": 120,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B6", "C6"],
-        "rows": ["F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "D7", "pin_b": "B4"}
-        ]
-    },
-    "ws2812": {
-        "pin": "F6"
-    },
-    "rgblight": {
-        "led_count": 6,
-        "driver": "custom",
-        "max_brightness": 120,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "twinkle": true
-        },
-        "default": {
-            "hue": 170
-        }
-    },
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0}
-            ]
-        }
-    }
-}
diff --git a/keyboards/work_louder/nano/keyboard.json b/keyboards/work_louder/nano/keyboard.json
new file mode 100644
index 00000000000..e15d095de0f
--- /dev/null
+++ b/keyboards/work_louder/nano/keyboard.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Nano Pad",
+    "manufacturer": "Work Louder",
+    "url": "https://worklouder.cc/",
+    "maintainer": "Work Louder",
+    "usb": {
+        "vid": "0x574C",
+        "pid": "0xE6F0",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": 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
+        },
+        "driver": "ws2812",
+        "max_brightness": 120,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D7", "pin_b": "B4"}
+        ]
+    },
+    "ws2812": {
+        "pin": "F6"
+    },
+    "rgblight": {
+        "led_count": 6,
+        "driver": "custom",
+        "max_brightness": 120,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "default": {
+            "hue": 170
+        }
+    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index bcbb4bb31d5..e0822c009b2 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -1,18 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
 SRC += rgb_functions.c
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json
similarity index 100%
rename from keyboards/work_louder/numpad/info.json
rename to keyboards/work_louder/numpad/keyboard.json
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index 36f9da013ec..bc31aab7c1f 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -15,6 +15,11 @@
  */
 
 #include "rgb_functions.h"
+#include <stdint.h>
+#include "quantum.h"
+#include "action.h"
+#include "rgblight.h"
+#include "rgb_matrix.h"
 
 #ifdef RGBLIGHT_ENABLE
 #undef WS2812_DI_PIN
diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index 9ad7cdb19c1..eaef787a222 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include "keycodes.h"
 
 #ifndef VIA_ENABLE
 #    ifndef RGB_MATRIX_TOGGLE
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index bd4af23167d..4969f8e8318 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -18,24 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define USE_I2C
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
deleted file mode 100644
index a496d4babab..00000000000
--- a/keyboards/wren/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "keyboard_name": "wren",
-    "manufacturer": "Walter Hanley",
-    "maintainer": "walterhanley",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
-        "rows": ["D3", "D2", "C6", "D4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "E6", "pin_b": "B4"}
-        ]
-    },
-    "split": {
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "B4", "pin_b": "E6"}
-                ]
-            }
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 9], "x": 0, "y": 0.5},
-                {"matrix": [0, 8], "x": 1, "y": 0.5},
-                {"matrix": [0, 7], "x": 2, "y": 0.5},
-                {"matrix": [0, 6], "x": 3, "y": 0.5},
-
-                {"matrix": [0, 5], "x": 4.5, "y": 0.5},
-                {"matrix": [0, 4], "x": 5.5, "y": 0.5},
-                {"matrix": [0, 3], "x": 6.5, "y": 0.25},
-                {"matrix": [0, 2], "x": 7.5, "y": 0},
-                {"matrix": [0, 1], "x": 8.5, "y": 0.25},
-                {"matrix": [0, 0], "x": 9.5, "y": 0.5},
-
-                {"matrix": [5, 0], "x": 14, "y": 0.5},
-                {"matrix": [5, 1], "x": 15, "y": 0.25},
-                {"matrix": [5, 2], "x": 16, "y": 0},
-                {"matrix": [5, 3], "x": 17, "y": 0.25},
-                {"matrix": [5, 4], "x": 18, "y": 0.5},
-                {"matrix": [5, 5], "x": 19, "y": 0.5},
-
-                {"matrix": [5, 6], "x": 20.5, "y": 0.5},
-                {"matrix": [5, 7], "x": 21.5, "y": 0.5},
-                {"matrix": [5, 8], "x": 22.5, "y": 0.5},
-                {"matrix": [5, 9], "x": 23.5, "y": 0.5},
-
-                {"matrix": [1, 9], "x": 0, "y": 1.5},
-                {"matrix": [1, 8], "x": 1, "y": 1.5},
-                {"matrix": [1, 7], "x": 2, "y": 1.5},
-                {"matrix": [1, 6], "x": 3, "y": 1.5},
-
-                {"matrix": [1, 5], "x": 4.5, "y": 1.5},
-                {"matrix": [1, 4], "x": 5.5, "y": 1.5},
-                {"matrix": [1, 3], "x": 6.5, "y": 1.25},
-                {"matrix": [1, 2], "x": 7.5, "y": 1},
-                {"matrix": [1, 1], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 0], "x": 9.5, "y": 1.5},
-
-                {"matrix": [6, 0], "x": 14, "y": 1.5},
-                {"matrix": [6, 1], "x": 15, "y": 1.25},
-                {"matrix": [6, 2], "x": 16, "y": 1},
-                {"matrix": [6, 3], "x": 17, "y": 1.25},
-                {"matrix": [6, 4], "x": 18, "y": 1.5},
-                {"matrix": [6, 5], "x": 19, "y": 1.5},
-
-                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
-                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
-                {"matrix": [6, 8], "x": 22.5, "y": 1.5},
-                {"matrix": [6, 9], "x": 23.5, "y": 1.5},
-
-                {"matrix": [2, 9], "x": 0, "y": 2.5},
-                {"matrix": [2, 8], "x": 1, "y": 2.5},
-                {"matrix": [2, 7], "x": 2, "y": 2.5},
-                {"matrix": [2, 6], "x": 3, "y": 2.5},
-
-                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 7.5, "y": 2},
-                {"matrix": [2, 1], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 0], "x": 9.5, "y": 2.5},
-
-                {"matrix": [7, 0], "x": 14, "y": 2.5},
-                {"matrix": [7, 1], "x": 15, "y": 2.25},
-                {"matrix": [7, 2], "x": 16, "y": 2},
-                {"matrix": [7, 3], "x": 17, "y": 2.25},
-                {"matrix": [7, 4], "x": 18, "y": 2.5},
-                {"matrix": [7, 5], "x": 19, "y": 2.5},
-
-                {"matrix": [7, 6], "x": 20.5, "y": 2.5},
-                {"matrix": [7, 7], "x": 21.5, "y": 2.5},
-                {"matrix": [7, 8], "x": 22.5, "y": 2.5},
-                {"matrix": [7, 9], "x": 23.5, "y": 2.5},
-
-                {"matrix": [3, 9], "x": 0, "y": 3.5},
-                {"matrix": [3, 8], "x": 1, "y": 3.5},
-                {"matrix": [3, 7], "x": 2, "y": 3.5},
-                {"matrix": [3, 6], "x": 3, "y": 3.5},
-
-                {"matrix": [3, 5], "x": 4.5, "y": 3.5},
-                {"matrix": [3, 4], "x": 5.5, "y": 3.5},
-                {"matrix": [3, 3], "x": 6.5, "y": 3.25},
-                {"matrix": [3, 2], "x": 7.5, "y": 3},
-                {"matrix": [3, 1], "x": 8.5, "y": 3.25},
-                {"matrix": [3, 0], "x": 9.5, "y": 3.5},
-
-                {"matrix": [8, 0], "x": 14, "y": 3.5},
-                {"matrix": [8, 1], "x": 15, "y": 3.25},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 3], "x": 17, "y": 3.25},
-                {"matrix": [8, 4], "x": 18, "y": 3.5},
-                {"matrix": [8, 5], "x": 19, "y": 3.5},
-
-                {"matrix": [8, 6], "x": 20.5, "y": 3.5},
-                {"matrix": [8, 7], "x": 21.5, "y": 3.5},
-                {"matrix": [8, 8], "x": 22.5, "y": 3.5},
-                {"matrix": [8, 9], "x": 23.5, "y": 3.5},
-
-                {"matrix": [4, 4], "x": 6, "y": 4.5},
-                {"matrix": [4, 3], "x": 7, "y": 4.5},
-                {"matrix": [4, 2], "x": 8, "y": 4.5},
-                {"matrix": [4, 1], "x": 9, "y": 4.75},
-
-                {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2},
-
-                {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2},
-
-                {"matrix": [9, 1], "x": 14.5, "y": 4.75},
-                {"matrix": [9, 2], "x": 15.5, "y": 4.5},
-                {"matrix": [9, 3], "x": 16.5, "y": 4.5},
-                {"matrix": [9, 4], "x": 17.5, "y": 4.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wren/keyboard.json b/keyboards/wren/keyboard.json
new file mode 100644
index 00000000000..c6d0330e2ff
--- /dev/null
+++ b/keyboards/wren/keyboard.json
@@ -0,0 +1,160 @@
+{
+    "keyboard_name": "wren",
+    "manufacturer": "Walter Hanley",
+    "maintainer": "walterhanley",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
+        "rows": ["D3", "D2", "C6", "D4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B4"}
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "B4", "pin_b": "E6"}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 9], "x": 0, "y": 0.5},
+                {"matrix": [0, 8], "x": 1, "y": 0.5},
+                {"matrix": [0, 7], "x": 2, "y": 0.5},
+                {"matrix": [0, 6], "x": 3, "y": 0.5},
+
+                {"matrix": [0, 5], "x": 4.5, "y": 0.5},
+                {"matrix": [0, 4], "x": 5.5, "y": 0.5},
+                {"matrix": [0, 3], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 7.5, "y": 0},
+                {"matrix": [0, 1], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 0], "x": 9.5, "y": 0.5},
+
+                {"matrix": [5, 0], "x": 14, "y": 0.5},
+                {"matrix": [5, 1], "x": 15, "y": 0.25},
+                {"matrix": [5, 2], "x": 16, "y": 0},
+                {"matrix": [5, 3], "x": 17, "y": 0.25},
+                {"matrix": [5, 4], "x": 18, "y": 0.5},
+                {"matrix": [5, 5], "x": 19, "y": 0.5},
+
+                {"matrix": [5, 6], "x": 20.5, "y": 0.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 0.5},
+                {"matrix": [5, 8], "x": 22.5, "y": 0.5},
+                {"matrix": [5, 9], "x": 23.5, "y": 0.5},
+
+                {"matrix": [1, 9], "x": 0, "y": 1.5},
+                {"matrix": [1, 8], "x": 1, "y": 1.5},
+                {"matrix": [1, 7], "x": 2, "y": 1.5},
+                {"matrix": [1, 6], "x": 3, "y": 1.5},
+
+                {"matrix": [1, 5], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 7.5, "y": 1},
+                {"matrix": [1, 1], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 0], "x": 9.5, "y": 1.5},
+
+                {"matrix": [6, 0], "x": 14, "y": 1.5},
+                {"matrix": [6, 1], "x": 15, "y": 1.25},
+                {"matrix": [6, 2], "x": 16, "y": 1},
+                {"matrix": [6, 3], "x": 17, "y": 1.25},
+                {"matrix": [6, 4], "x": 18, "y": 1.5},
+                {"matrix": [6, 5], "x": 19, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 22.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 23.5, "y": 1.5},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.5},
+                {"matrix": [2, 8], "x": 1, "y": 2.5},
+                {"matrix": [2, 7], "x": 2, "y": 2.5},
+                {"matrix": [2, 6], "x": 3, "y": 2.5},
+
+                {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 7.5, "y": 2},
+                {"matrix": [2, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 0], "x": 9.5, "y": 2.5},
+
+                {"matrix": [7, 0], "x": 14, "y": 2.5},
+                {"matrix": [7, 1], "x": 15, "y": 2.25},
+                {"matrix": [7, 2], "x": 16, "y": 2},
+                {"matrix": [7, 3], "x": 17, "y": 2.25},
+                {"matrix": [7, 4], "x": 18, "y": 2.5},
+                {"matrix": [7, 5], "x": 19, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [7, 7], "x": 21.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 22.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 23.5, "y": 2.5},
+
+                {"matrix": [3, 9], "x": 0, "y": 3.5},
+                {"matrix": [3, 8], "x": 1, "y": 3.5},
+                {"matrix": [3, 7], "x": 2, "y": 3.5},
+                {"matrix": [3, 6], "x": 3, "y": 3.5},
+
+                {"matrix": [3, 5], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 7.5, "y": 3},
+                {"matrix": [3, 1], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 0], "x": 9.5, "y": 3.5},
+
+                {"matrix": [8, 0], "x": 14, "y": 3.5},
+                {"matrix": [8, 1], "x": 15, "y": 3.25},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 3], "x": 17, "y": 3.25},
+                {"matrix": [8, 4], "x": 18, "y": 3.5},
+                {"matrix": [8, 5], "x": 19, "y": 3.5},
+
+                {"matrix": [8, 6], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 7], "x": 21.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 22.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 23.5, "y": 3.5},
+
+                {"matrix": [4, 4], "x": 6, "y": 4.5},
+                {"matrix": [4, 3], "x": 7, "y": 4.5},
+                {"matrix": [4, 2], "x": 8, "y": 4.5},
+                {"matrix": [4, 1], "x": 9, "y": 4.75},
+
+                {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2},
+
+                {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2},
+
+                {"matrix": [9, 1], "x": 14.5, "y": 4.75},
+                {"matrix": [9, 2], "x": 15.5, "y": 4.5},
+                {"matrix": [9, 3], "x": 16.5, "y": 4.5},
+                {"matrix": [9, 4], "x": 17.5, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk
deleted file mode 100644
index 6b9cc95ebf2..00000000000
--- a/keyboards/wren/rules.mk
+++ /dev/null
@@ -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
-ENCODER_ENABLE = yes        # Enables the use of one or more encoders
-SPLIT_KEYBOARD = yes        # Enables split keyboard
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
deleted file mode 100644
index f0951430db3..00000000000
--- a/keyboards/wuque/creek70/info.json
+++ /dev/null
@@ -1,706 +0,0 @@
-{
-  "keyboard_name": "creek70",
-  "manufacturer": "wuque studio",
-  "maintainer": "spbgzh",
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "diode_direction": "COL2ROW",
-  "features": {
-    "bootmagic": true,
-    "command": false,
-    "console": false,
-    "extrakey": true,
-    "mousekey": true,
-    "nkro": true
-  },
-  "matrix_pins": {
-    "rows": ["B3", "B2", "F0", "D3", "D1"],
-    "cols": ["E6", "D4", "D7", "F7", "D2", "D5", "D6", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "B7", "B1", "B0"]
-  },
-  "usb": {
-    "vid": "0x916D",
-    "pid": "0x0001",
-    "device_version": "0.0.1"
-  },
-  "indicators": {
-    "caps_lock": "F6",
-    "on_state": 0
-  },
-  "ws2812": {
-    "pin": "D0"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 7,
-    "max_brightness": 200,
-    "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
-    }
-  },
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
-  },
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0},
-        {"matrix": [2, 14], "x": 15.25, "y": 0},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"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},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
-        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
-        {"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},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.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},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi_split_bs_rshift": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0},
-        {"matrix": [2, 14], "x": 15.25, "y": 0},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.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},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi_split_space": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
-        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
-        {"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},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi_split_space_split_bs_rshift": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0},
-        {"matrix": [2, 14], "x": 15.25, "y": 0},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
-        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
-        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
-        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
-        {"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},
-        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi_tsangan": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 2], "x": 2.75, "y": 4},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 13.75, "y": 4},
-        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    },
-    "LAYOUT_ansi_tsangan_split_bs_rshift": {
-      "layout": [
-        {"matrix": [0, 1], "x": 1.25, "y": 0},
-        {"matrix": [0, 2], "x": 2.25, "y": 0},
-        {"matrix": [0, 3], "x": 3.25, "y": 0},
-        {"matrix": [0, 4], "x": 4.25, "y": 0},
-        {"matrix": [0, 5], "x": 5.25, "y": 0},
-        {"matrix": [0, 6], "x": 6.25, "y": 0},
-        {"matrix": [0, 7], "x": 7.25, "y": 0},
-        {"matrix": [0, 8], "x": 8.25, "y": 0},
-        {"matrix": [0, 9], "x": 9.25, "y": 0},
-        {"matrix": [0, 10], "x": 10.25, "y": 0},
-        {"matrix": [0, 11], "x": 11.25, "y": 0},
-        {"matrix": [0, 12], "x": 12.25, "y": 0},
-        {"matrix": [0, 13], "x": 13.25, "y": 0},
-        {"matrix": [0, 14], "x": 14.25, "y": 0},
-        {"matrix": [2, 14], "x": 15.25, "y": 0},
-
-        {"matrix": [0, 15], "x": 16.5, "y": 0},
-        {"matrix": [0, 16], "x": 17.5, "y": 0},
-        {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-
-        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-        {"matrix": [1, 2], "x": 2.75, "y": 1},
-        {"matrix": [1, 3], "x": 3.75, "y": 1},
-        {"matrix": [1, 4], "x": 4.75, "y": 1},
-        {"matrix": [1, 5], "x": 5.75, "y": 1},
-        {"matrix": [1, 6], "x": 6.75, "y": 1},
-        {"matrix": [1, 7], "x": 7.75, "y": 1},
-        {"matrix": [1, 8], "x": 8.75, "y": 1},
-        {"matrix": [1, 9], "x": 9.75, "y": 1},
-        {"matrix": [1, 10], "x": 10.75, "y": 1},
-        {"matrix": [1, 11], "x": 11.75, "y": 1},
-        {"matrix": [1, 12], "x": 12.75, "y": 1},
-        {"matrix": [1, 13], "x": 13.75, "y": 1},
-        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
-        {"matrix": [1, 15], "x": 16.5, "y": 1},
-        {"matrix": [1, 16], "x": 17.5, "y": 1},
-        {"matrix": [1, 17], "x": 18.5, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2},
-
-        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-        {"matrix": [2, 2], "x": 3, "y": 2},
-        {"matrix": [2, 3], "x": 4, "y": 2},
-        {"matrix": [2, 4], "x": 5, "y": 2},
-        {"matrix": [2, 5], "x": 6, "y": 2},
-        {"matrix": [2, 6], "x": 7, "y": 2},
-        {"matrix": [2, 7], "x": 8, "y": 2},
-        {"matrix": [2, 8], "x": 9, "y": 2},
-        {"matrix": [2, 9], "x": 10, "y": 2},
-        {"matrix": [2, 10], "x": 11, "y": 2},
-        {"matrix": [2, 11], "x": 12, "y": 2},
-        {"matrix": [2, 12], "x": 13, "y": 2},
-        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
-        {"matrix": [3, 0], "x": 0, "y": 3},
-
-        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-        {"matrix": [3, 3], "x": 3.5, "y": 3},
-        {"matrix": [3, 4], "x": 4.5, "y": 3},
-        {"matrix": [3, 5], "x": 5.5, "y": 3},
-        {"matrix": [3, 6], "x": 6.5, "y": 3},
-        {"matrix": [3, 7], "x": 7.5, "y": 3},
-        {"matrix": [3, 8], "x": 8.5, "y": 3},
-        {"matrix": [3, 9], "x": 9.5, "y": 3},
-        {"matrix": [3, 10], "x": 10.5, "y": 3},
-        {"matrix": [3, 11], "x": 11.5, "y": 3},
-        {"matrix": [3, 12], "x": 12.5, "y": 3},
-        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
-        {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-        {"matrix": [3, 16], "x": 17.5, "y": 3},
-
-        {"matrix": [4, 0], "x": 0, "y": 4},
-
-        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 2], "x": 2.75, "y": 4},
-        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
-        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
-        {"matrix": [4, 13], "x": 13.75, "y": 4},
-        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
-
-        {"matrix": [4, 15], "x": 16.5, "y": 4},
-        {"matrix": [4, 16], "x": 17.5, "y": 4},
-        {"matrix": [4, 17], "x": 18.5, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/wuque/creek70/keyboard.json b/keyboards/wuque/creek70/keyboard.json
new file mode 100644
index 00000000000..e7227ace8e5
--- /dev/null
+++ b/keyboards/wuque/creek70/keyboard.json
@@ -0,0 +1,707 @@
+{
+  "keyboard_name": "creek70",
+  "manufacturer": "wuque studio",
+  "maintainer": "spbgzh",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "rows": ["B3", "B2", "F0", "D3", "D1"],
+    "cols": ["E6", "D4", "D7", "F7", "D2", "D5", "D6", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "B7", "B1", "B0"]
+  },
+  "usb": {
+    "vid": "0x916D",
+    "pid": "0x0001",
+    "device_version": "0.0.1"
+  },
+  "indicators": {
+    "caps_lock": "F6",
+    "on_state": 0
+  },
+  "ws2812": {
+    "pin": "D0"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 7,
+    "max_brightness": 200,
+    "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
+    }
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"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},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"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},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.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},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.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},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_space": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"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},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_split_space_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+        {"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},
+        {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_tsangan": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 13.75, "y": 4},
+        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    },
+    "LAYOUT_ansi_tsangan_split_bs_rshift": {
+      "layout": [
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "x": 5.25, "y": 0},
+        {"matrix": [0, 6], "x": 6.25, "y": 0},
+        {"matrix": [0, 7], "x": 7.25, "y": 0},
+        {"matrix": [0, 8], "x": 8.25, "y": 0},
+        {"matrix": [0, 9], "x": 9.25, "y": 0},
+        {"matrix": [0, 10], "x": 10.25, "y": 0},
+        {"matrix": [0, 11], "x": 11.25, "y": 0},
+        {"matrix": [0, 12], "x": 12.25, "y": 0},
+        {"matrix": [0, 13], "x": 13.25, "y": 0},
+        {"matrix": [0, 14], "x": 14.25, "y": 0},
+        {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+        {"matrix": [0, 15], "x": 16.5, "y": 0},
+        {"matrix": [0, 16], "x": 17.5, "y": 0},
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+
+        {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 2.75, "y": 1},
+        {"matrix": [1, 3], "x": 3.75, "y": 1},
+        {"matrix": [1, 4], "x": 4.75, "y": 1},
+        {"matrix": [1, 5], "x": 5.75, "y": 1},
+        {"matrix": [1, 6], "x": 6.75, "y": 1},
+        {"matrix": [1, 7], "x": 7.75, "y": 1},
+        {"matrix": [1, 8], "x": 8.75, "y": 1},
+        {"matrix": [1, 9], "x": 9.75, "y": 1},
+        {"matrix": [1, 10], "x": 10.75, "y": 1},
+        {"matrix": [1, 11], "x": 11.75, "y": 1},
+        {"matrix": [1, 12], "x": 12.75, "y": 1},
+        {"matrix": [1, 13], "x": 13.75, "y": 1},
+        {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 15], "x": 16.5, "y": 1},
+        {"matrix": [1, 16], "x": 17.5, "y": 1},
+        {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [2, 5], "x": 6, "y": 2},
+        {"matrix": [2, 6], "x": 7, "y": 2},
+        {"matrix": [2, 7], "x": 8, "y": 2},
+        {"matrix": [2, 8], "x": 9, "y": 2},
+        {"matrix": [2, 9], "x": 10, "y": 2},
+        {"matrix": [2, 10], "x": 11, "y": 2},
+        {"matrix": [2, 11], "x": 12, "y": 2},
+        {"matrix": [2, 12], "x": 13, "y": 2},
+        {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+        {"matrix": [3, 6], "x": 6.5, "y": 3},
+        {"matrix": [3, 7], "x": 7.5, "y": 3},
+        {"matrix": [3, 8], "x": 8.5, "y": 3},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3},
+        {"matrix": [3, 11], "x": 11.5, "y": 3},
+        {"matrix": [3, 12], "x": 12.5, "y": 3},
+        {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 2.75, "y": 4},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 13], "x": 13.75, "y": 4},
+        {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+        {"matrix": [4, 15], "x": 16.5, "y": 4},
+        {"matrix": [4, 16], "x": 17.5, "y": 4},
+        {"matrix": [4, 17], "x": 18.5, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/wuque/creek70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
deleted file mode 100644
index db5a8d534ef..00000000000
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 wuquestudio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
deleted file mode 100644
index a65b265b66c..00000000000
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ /dev/null
@@ -1,618 +0,0 @@
-{
-    "keyboard_name": "ikki68 Aurora",
-    "manufacturer": "wuque studio",
-    "url": "https://ikki68.com/",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x706B",
-        "pid": "0x0011",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
-        "rows": ["B7", "B3", "B2", "B1", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "F7",
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 20,
-        "max_brightness": 200,
-        "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
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["68_ansi", "68_iso"],
-    "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": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "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": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_ansi_split_lshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "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": 2.75},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_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, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [1, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        },
-        "LAYOUT_68_ansi_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, "y": 0, "w": 2},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1},
-                {"matrix": [1, 15], "x": 16.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},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [3, 14], "x": 15.25, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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": 14.25, "y": 4},
-                {"matrix": [4, 14], "x": 15.25, "y": 4},
-                {"matrix": [4, 15], "x": 16.25, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wuque/ikki68_aurora/keyboard.json b/keyboards/wuque/ikki68_aurora/keyboard.json
new file mode 100644
index 00000000000..31d0ff2f91e
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keyboard.json
@@ -0,0 +1,631 @@
+{
+    "keyboard_name": "ikki68 Aurora",
+    "manufacturer": "wuque studio",
+    "url": "https://ikki68.com/",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x706B",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
+        "rows": ["B7", "B3", "B2", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "F7",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 20,
+        "max_brightness": 200,
+        "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
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["68_ansi", "68_iso"],
+    "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": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "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": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_ansi_split_lshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "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": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_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, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        },
+        "LAYOUT_68_ansi_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, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.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},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 15], "x": 16.25, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk
deleted file mode 100644
index 540e0c2514d..00000000000
--- a/keyboards/wuque/ikki68_aurora/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUT = 68_ansi 68_iso
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
deleted file mode 100644
index f27073b2858..00000000000
--- a/keyboards/wuque/serneity65/info.json
+++ /dev/null
@@ -1,407 +0,0 @@
-{
-    "keyboard_name": "serneity65",
-    "manufacturer": "wuque",
-    "url": "https://wuque.com/",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x906B",
-        "pid": "0x0003",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
-        "rows": ["B0", "F0", "B1", "D2", "D3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B2", "pin_b": "B3"}
-        ]
-    },
-    "indicators": {
-        "caps_lock": "C6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_split_lshift": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_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, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 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": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/wuque/serneity65/keyboard.json b/keyboards/wuque/serneity65/keyboard.json
new file mode 100644
index 00000000000..b64103d5338
--- /dev/null
+++ b/keyboards/wuque/serneity65/keyboard.json
@@ -0,0 +1,415 @@
+{
+    "keyboard_name": "serneity65",
+    "manufacturer": "wuque",
+    "url": "https://wuque.com/",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x906B",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
+        "rows": ["B0", "F0", "B1", "D2", "D3"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B2", "pin_b": "B3"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "C6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_lshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_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, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk
deleted file mode 100644
index 8c163bff643..00000000000
--- a/keyboards/wuque/serneity65/rules.mk
+++ /dev/null
@@ -1,15 +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 = 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
-ENCODER_ENABLE = yes		# Enable Encoder
-
-LAYOUT = 65_ansi
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
deleted file mode 100644
index 487fc766983..00000000000
--- a/keyboards/xbows/woody/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "keyboard_name": "WOO-DY",
-    "manufacturer": "X-BOWS",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1224",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_val": true,
-            "band_pinwheel_val": 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,
-            "solid_reactive_simple": true,
-            "solid_reactive": true
-        },
-        "driver": "is31fl3731",
-        "led_flush_limit": 26,
-        "led_process_limit": 4,
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["B3", "B2", "B1", "B0", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "debounce": 3,
-    "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, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xbows/woody/keyboard.json b/keyboards/xbows/woody/keyboard.json
new file mode 100644
index 00000000000..538354507e0
--- /dev/null
+++ b/keyboards/xbows/woody/keyboard.json
@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "WOO-DY",
+    "manufacturer": "X-BOWS",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1224",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_val": true,
+            "band_pinwheel_val": 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,
+            "solid_reactive_simple": true,
+            "solid_reactive": true
+        },
+        "driver": "is31fl3731",
+        "led_flush_limit": 26,
+        "led_process_limit": 4,
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B3", "B2", "B1", "B0", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "debounce": 3,
+    "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, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
deleted file mode 100644
index 90dd66d7722..00000000000
--- a/keyboards/xbows/woody/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-BACKLIGHT_ENABLE = no
-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
-AUDIO_ENABLE = no
-RGB_MATRIX_ENABLE = yes            # Use RGB matrix
-NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json
index 4bdc6df8a93..aafac25e05d 100644
--- a/keyboards/xelus/dawn60/info.json
+++ b/keyboards/xelus/dawn60/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0060",
         "device_version": "0.0.1"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 25529426351..e64b0895fac 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -20,11 +20,6 @@
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 #define IS31FL3731_LED_COUNT 64
 
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
deleted file mode 100644
index 872bf0d33a3..00000000000
--- a/keyboards/xelus/dawn60/rev1/info.json
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-    "ws2812": {
-        "pin": "F0"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B1", "B3", "F1", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/dawn60/rev1/keyboard.json b/keyboards/xelus/dawn60/rev1/keyboard.json
new file mode 100644
index 00000000000..bfdaf26e764
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1/keyboard.json
@@ -0,0 +1,231 @@
+{
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B1", "B3", "F1", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
index 0a72a60eca1..879710e8e7a 100644
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -3,27 +3,12 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# 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
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
 CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
 WS2812_DRIVER_REQUIRED = yes
 
-
 # project specific files
 SRC +=	keyboards/wilba_tech/wt_main.c \
 		keyboards/wilba_tech/wt_rgb_backlight.c \
 		quantum/color.c \
 		drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 81d5dc1e83e..b54fcaee2ad 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
 //RGB Underglow defines
 #define WS2812_LED_TOTAL 20
 
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
deleted file mode 100644
index 12d6a5d5292..00000000000
--- a/keyboards/xelus/dawn60/rev1_qmk/info.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-    "ws2812": {
-        "pin": "F0"
-    },
-    "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,
-            "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": {
-            "val": 80
-        },
-        "driver": "custom"
-    },
-    "matrix_pins": {
-        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B1", "B3", "F1", "F6", "F7"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/keyboard.json b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json
new file mode 100644
index 00000000000..7c3aa607dfe
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json
@@ -0,0 +1,285 @@
+{
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "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,
+            "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": {
+            "val": 80
+        },
+        "driver": "custom"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B1", "B3", "F1", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index edb15fa760d..5a17af39fcd 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -3,28 +3,9 @@
 # backlight effects.
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
-RGB_MATRIX_ENABLE = yes     # Enable RGB matrix effects.
+I2C_DRIVER_REQUIRED = yes
 WS2812_DRIVER_REQUIRED = yes
 
-COMMON_VPATH += $(DRIVER_PATH)/issi
-
 # project specific files
+COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC +=  drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
deleted file mode 100755
index c8b4a6e5b16..00000000000
--- a/keyboards/xelus/la_plus/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-// Custom Startup Animation
-// comment out for solid animation
-// #define STARTUP_ANIMATION_DOTS
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
deleted file mode 100644
index 85e4e60215c..00000000000
--- a/keyboards/xelus/la_plus/info.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-    "keyboard_name": "MechaMaker La+",
-    "manufacturer": "Xelus",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x5845",
-        "pid": "0x4C50",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "F1"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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
-        },
-        "default": {
-            "animation": "cycle_all",
-            "val": 80
-        },
-        "driver": "ws2812",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
-        "rows": ["B0", "B1", "F0", "F4", "F5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_65_ansi_rwkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_rwkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
-                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
-                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
-                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
-                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
-                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
-                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
-                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
-                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
-                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
-                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
-                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
-                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
-                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/la_plus/keyboard.json b/keyboards/xelus/la_plus/keyboard.json
new file mode 100644
index 00000000000..902364471ff
--- /dev/null
+++ b/keyboards/xelus/la_plus/keyboard.json
@@ -0,0 +1,232 @@
+{
+    "keyboard_name": "MechaMaker La+",
+    "manufacturer": "Xelus",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x5845",
+        "pid": "0x4C50",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "ws2812": {
+        "pin": "F1"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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
+        },
+        "default": {
+            "animation": "cycle_all",
+            "val": 80
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["B0", "B1", "F0", "F4", "F5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_rwkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_rwkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk
index 7f3c8075a53..942ef4c5dbd 100755
--- a/keyboards/xelus/la_plus/rules.mk
+++ b/keyboards/xelus/la_plus/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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
-
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_CUSTOM_KB = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/pachi/rgb/info.json b/keyboards/xelus/pachi/rgb/info.json
new file mode 100644
index 00000000000..9bf3ca04ef7
--- /dev/null
+++ b/keyboards/xelus/pachi/rgb/info.json
@@ -0,0 +1,20 @@
+{
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    }
+}
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 6cb40a9fae4..8ed9a356334 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/keyboard.json
similarity index 100%
rename from keyboards/xelus/pachi/rgb/rev1/info.json
rename to keyboards/xelus/pachi/rgb/rev1/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk
index 4c27f450080..8ecbd28acc4 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -1,20 +1,4 @@
-# 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 = 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
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-
-RGB_MATRIX_ENABLE = yes
-
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
 
-LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 50f7d6ac1df..a5fc38e0708 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PIN        B6
 #define I2C1_SDA_PIN        B7
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/keyboard.json
similarity index 100%
rename from keyboards/xelus/pachi/rgb/rev2/info.json
rename to keyboards/xelus/pachi/rgb/rev2/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk
index 62bb12bfb04..8ecbd28acc4 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -1,19 +1,4 @@
-# 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 = 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
-
-RGB_MATRIX_ENABLE = yes
-
 COMMON_VPATH += $(DRIVER_PATH)/issi
 SRC += drivers/led/issi/is31fl3741.c
 
-LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 45f2a545309..3d3bc49228f 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
 // I2C config
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
deleted file mode 100644
index 0342177e641..00000000000
--- a/keyboards/xelus/rs108/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-    "keyboard_name": "RS108",
-    "manufacturer": "Xelus",
-    "url": "",
-    "maintainer": "xelus22",
-    "usb": {
-        "vid": "0x5845",
-        "pid": "0x5208",
-        "device_version": "0.0.2",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
-        "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "indicators": {
-        "caps_lock": "A6",
-        "num_lock": "A14",
-        "scroll_lock": "A13"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_108_fullsize_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [1, 4], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 5], "x": 11, "y": 0},
-                {"matrix": [1, 5], "x": 12, "y": 0},
-                {"matrix": [0, 6], "x": 13, "y": 0},
-                {"matrix": [1, 6], "x": 14, "y": 0},
-
-                {"matrix": [0, 7], "x": 15.25, "y": 0},
-                {"matrix": [1, 7], "x": 16.25, "y": 0},
-                {"matrix": [0, 8], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 8], "x": 18.5, "y": 0},
-                {"matrix": [0, 9], "x": 19.5, "y": 0},
-                {"matrix": [1, 9], "x": 20.5, "y": 0},
-                {"matrix": [0, 10], "x": 21.5, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1.25},
-                {"matrix": [3, 0], "x": 1, "y": 1.25},
-                {"matrix": [2, 1], "x": 2, "y": 1.25},
-                {"matrix": [3, 1], "x": 3, "y": 1.25},
-                {"matrix": [2, 2], "x": 4, "y": 1.25},
-                {"matrix": [3, 2], "x": 5, "y": 1.25},
-                {"matrix": [2, 3], "x": 6, "y": 1.25},
-                {"matrix": [3, 3], "x": 7, "y": 1.25},
-                {"matrix": [2, 4], "x": 8, "y": 1.25},
-                {"matrix": [3, 4], "x": 9, "y": 1.25},
-                {"matrix": [2, 5], "x": 10, "y": 1.25},
-                {"matrix": [3, 5], "x": 11, "y": 1.25},
-                {"matrix": [2, 6], "x": 12, "y": 1.25},
-                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
-                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
-                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
-                {"matrix": [3, 8], "x": 18.5, "y": 1.25},
-                {"matrix": [2, 9], "x": 19.5, "y": 1.25},
-                {"matrix": [3, 9], "x": 20.5, "y": 1.25},
-                {"matrix": [2, 10], "x": 21.5, "y": 1.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
-                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
-                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
-                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
-                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
-                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
-                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
-                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
-                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
-                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
-                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
-                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
-                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
-                {"matrix": [5, 8], "x": 18.5, "y": 2.25},
-                {"matrix": [4, 9], "x": 19.5, "y": 2.25},
-                {"matrix": [5, 9], "x": 20.5, "y": 2.25},
-
-                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
-                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
-                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
-                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
-                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
-                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
-                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
-                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
-                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
-                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [7, 8], "x": 18.5, "y": 3.25},
-                {"matrix": [6, 9], "x": 19.5, "y": 3.25},
-                {"matrix": [7, 9], "x": 20.5, "y": 3.25},
-                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
-
-                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
-                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
-                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
-                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
-                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
-                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
-                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
-                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
-                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
-                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
-                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
-                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
-                {"matrix": [8, 9], "x": 19.5, "y": 4.25},
-                {"matrix": [9, 9], "x": 20.5, "y": 4.25},
-
-                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
-                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-
-                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
-                {"matrix": [10, 8], "x": 17.25, "y": 5.25},
-                {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
-
-                {"matrix": [11, 9], "x": 20.5, "y": 5.25},
-                {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/rs108/keyboard.json b/keyboards/xelus/rs108/keyboard.json
new file mode 100644
index 00000000000..12ffbb3fdc2
--- /dev/null
+++ b/keyboards/xelus/rs108/keyboard.json
@@ -0,0 +1,176 @@
+{
+    "keyboard_name": "RS108",
+    "manufacturer": "Xelus",
+    "url": "",
+    "maintainer": "xelus22",
+    "usb": {
+        "vid": "0x5845",
+        "pid": "0x5208",
+        "device_version": "0.0.2",
+        "force_nkro": true,
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
+        "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "indicators": {
+        "caps_lock": "A6",
+        "num_lock": "A14",
+        "scroll_lock": "A13"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_108_fullsize_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+                {"matrix": [0, 9], "x": 19.5, "y": 0},
+                {"matrix": [1, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [2, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 20.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 20.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+
+                {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.25},
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
+
+                {"matrix": [11, 9], "x": 20.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs108/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
index 98b545a9e81..c1771427f13 100644
--- a/keyboards/xelus/rs60/info.json
+++ b/keyboards/xelus/rs60/info.json
@@ -7,5 +7,11 @@
         "vid": "0x5845",
         "pid": "0x5253"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"]
 }
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
deleted file mode 100644
index 3c53ebc8bcf..00000000000
--- a/keyboards/xelus/rs60/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 45f2a545309..3d3bc49228f 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
 // I2C config
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
deleted file mode 100644
index 499a5a922fc..00000000000
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ /dev/null
@@ -1,299 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.2.0",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["B15", "B14", "B12", "B1", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "indicators": {
-        "caps_lock": "A1"
-    },
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 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, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/rs60/rev2_0/keyboard.json b/keyboards/xelus/rs60/rev2_0/keyboard.json
new file mode 100644
index 00000000000..9cb7b24043e
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_0/keyboard.json
@@ -0,0 +1,310 @@
+{
+    "usb": {
+        "device_version": "0.2.0",
+        "force_nkro": true,
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B15", "B14", "B12", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "indicators": {
+        "caps_lock": "A1"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
deleted file mode 100644
index 430a5a47f7f..00000000000
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
deleted file mode 100644
index fe87561e61c..00000000000
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-    "usb": {
-        "device_version": "0.2.1",
-        "force_nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["B15", "B14", "B12", "B1", "B0"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "wear_leveling": {
-            "backing_size": 4096
-        }
-    },
-    "indicators": {
-        "caps_lock": "A1",
-        "on_state": 0
-    },
-    "processor": "STM32L412",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 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, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        },
-        "LAYOUT_60_ansi_tsangan": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/rs60/rev2_1/keyboard.json b/keyboards/xelus/rs60/rev2_1/keyboard.json
new file mode 100644
index 00000000000..d7e56fe1cfc
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/keyboard.json
@@ -0,0 +1,313 @@
+{
+    "usb": {
+        "device_version": "0.2.1",
+        "force_nkro": true,
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B15", "B14", "B12", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
+    "indicators": {
+        "caps_lock": "A1",
+        "on_state": 0
+    },
+    "processor": "STM32L412",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_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": [2, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
deleted file mode 100644
index 651f613045d..00000000000
--- a/keyboards/xelus/trinityxttkl/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
deleted file mode 100644
index f3b8956b137..00000000000
--- a/keyboards/xelus/trinityxttkl/info.json
+++ /dev/null
@@ -1,511 +0,0 @@
-{
-    "keyboard_name": "Trinity XT TKL",
-    "manufacturer": "Xelus",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x5845",
-        "pid": "0x5854",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
-        "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "A1",
-        "scroll_lock": "A13"
-    },
-    "processor": "STM32F072",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
-    },
-    "layouts": {
-        "LAYOUT_ansi_split_space": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
-                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
-                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
-                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
-                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
-                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
-                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
-                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
-                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
-                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
-                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
-                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
-                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
-                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
-                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
-                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
-                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
-                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
-                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
-                {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
-                {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
-                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_split_space_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
-                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
-                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
-                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
-                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
-                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
-                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
-                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
-                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
-                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
-                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
-                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
-                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
-                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
-                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
-                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
-                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
-                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
-                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
-                {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
-                {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
-                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
-                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
-                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
-                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
-                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
-                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
-                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
-                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
-                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
-                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
-                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
-                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
-                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
-                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
-                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
-                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
-                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
-                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
-                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
-                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
-                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs_rshift": {
-            "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
-                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
-                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
-                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
-                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
-                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
-                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
-                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
-                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
-                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
-                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
-                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
-                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
-                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
-                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
-                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
-                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
-                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
-                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
-                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
-                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
-                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
-                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
-                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
-                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
-                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
-                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
-                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
-                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
-                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
-                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
-                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
-                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
-                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
-                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
-                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
-                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
-                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
-                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
-                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
-                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
-                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
-                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
-                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
-                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
-                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
-                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
-                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
-                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
-                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
-                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
-                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
-                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
-                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
-                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
-                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
-                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
-                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
-                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
-                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
-                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
-                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
-                {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
-                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
-                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
-                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
-                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
-                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
-                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
-                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
-                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/trinityxttkl/keyboard.json b/keyboards/xelus/trinityxttkl/keyboard.json
new file mode 100644
index 00000000000..eea94c59792
--- /dev/null
+++ b/keyboards/xelus/trinityxttkl/keyboard.json
@@ -0,0 +1,524 @@
+{
+    "keyboard_name": "Trinity XT TKL",
+    "manufacturer": "Xelus",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x5845",
+        "pid": "0x5854",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
+        "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "A1",
+        "scroll_lock": "A13"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
+    },
+    "layouts": {
+        "LAYOUT_ansi_split_space": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+                {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+                {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_split_space_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+                {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+                {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+                {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+                {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+                {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+                {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+                {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+                {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+                {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+                {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+                {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+                {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+                {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+                {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+                {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+                {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+                {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+                {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+                {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+                {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+                {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+                {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+                {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+                {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+                {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+                {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+                {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+                {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+                {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+                {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+                {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+                {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+                {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk
index ef90964f9b3..0ab54aaaf71 100644
--- a/keyboards/xelus/trinityxttkl/rules.mk
+++ b/keyboards/xelus/trinityxttkl/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes   # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = yes    # Console for debug
-COMMAND_ENABLE = no     # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-
diff --git a/keyboards/xelus/valor/info.json b/keyboards/xelus/valor/info.json
new file mode 100644
index 00000000000..588361fc989
--- /dev/null
+++ b/keyboards/xelus/valor/info.json
@@ -0,0 +1,8 @@
+{
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    }
+}
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
deleted file mode 100644
index fe18ba5b717..00000000000
--- a/keyboards/xelus/valor/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 9491d1f175d..7b968ea2a39 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PIN        B8
 #define I2C1_SDA_PIN        B9
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
deleted file mode 100644
index 196c1ad1c43..00000000000
--- a/keyboards/xelus/valor/rev2/info.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-    "keyboard_name": "Valor Rev2",
-    "manufacturer": "Xelus",
-    "url": "",
-    "maintainer": "Xelus22",
-    "usb": {
-        "vid": "0x5845",
-        "pid": "0x5653",
-        "device_version": "0.0.1"
-    },
-    "ws2812": {
-        "pin": "A9",
-        "driver": "pwm"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 200,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
-        "rows": ["B11", "B10", "A3", "A1", "A2"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "processor": "STM32L422",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_alice_split_bs"
-    },
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 10.25, "y": 0},
-                {"matrix": [0, 9], "x": 11.25, "y": 0},
-                {"matrix": [0, 10], "x": 12.25, "y": 0},
-                {"matrix": [0, 11], "x": 13.25, "y": 0},
-                {"matrix": [0, 12], "x": 14.25, "y": 0},
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 8], "x": 10.25, "y": 0},
-                {"matrix": [0, 9], "x": 11.25, "y": 0},
-                {"matrix": [0, 10], "x": 12.25, "y": 0},
-                {"matrix": [0, 11], "x": 13.25, "y": 0},
-                {"matrix": [0, 12], "x": 14.25, "y": 0},
-                {"matrix": [0, 13], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
-                {"matrix": [2, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xelus/valor/rev2/keyboard.json b/keyboards/xelus/valor/rev2/keyboard.json
new file mode 100644
index 00000000000..21de5fb4a2a
--- /dev/null
+++ b/keyboards/xelus/valor/rev2/keyboard.json
@@ -0,0 +1,250 @@
+{
+    "keyboard_name": "Valor Rev2",
+    "manufacturer": "Xelus",
+    "url": "",
+    "maintainer": "Xelus22",
+    "usb": {
+        "vid": "0x5845",
+        "pid": "0x5653",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "A9",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 200,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B11", "B10", "A3", "A1", "A2"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [2, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
index 7fd72e35e76..8d76aac36cc 100644
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_CUSTOM_KB = yes
 
 OPT = 2
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json
index fee349b989a..a0b7a70a89f 100644
--- a/keyboards/xelus/valor_frl_tkl/info.json
+++ b/keyboards/xelus/valor_frl_tkl/info.json
@@ -6,6 +6,12 @@
         "vid": "0x5845",
         "pid": "0x4654"
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_ansi_split_bs_rshift"
     },
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h
index af702fcafda..44406be7b59 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev1/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C OLED defines
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index cb37aaa4ccb..b085b99d884 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -16,10 +16,4 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
deleted file mode 100644
index d3e21777934..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "keyboard_name": "Valor FRL TKL Rev2.0",
-    "usb": {
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
-        "rows": ["A15", "A14", "A10", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json
new file mode 100644
index 00000000000..36db1d4398e
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Valor FRL TKL Rev2.0",
+    "usb": {
+        "device_version": "0.0.2",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["A15", "A14", "A10", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
deleted file mode 100644
index 8ee0c3e8fe8..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index cb37aaa4ccb..b085b99d884 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -16,10 +16,4 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
deleted file mode 100644
index 61a26ca4c97..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "keyboard_name": "Valor FRL TKL Rev2.2",
-    "usb": {
-        "device_version": "0.0.3"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
-        "rows": ["A15", "A14", "A13", "B3", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json
new file mode 100644
index 00000000000..376d73a4299
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "Valor FRL TKL Rev2.2",
+    "usb": {
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+        "rows": ["A15", "A14", "A13", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
deleted file mode 100644
index 8ee0c3e8fe8..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
+++ /dev/null
@@ -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 = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 877313776ad..17967f05f59 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PAL_MODE   4
 #define I2C1_SDA_PAL_MODE   4
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/keyboard.json
similarity index 100%
rename from keyboards/xelus/xs60/hotswap/info.json
rename to keyboards/xelus/xs60/hotswap/keyboard.json
diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk
index f632b896ab1..3aa0e2bf061 100644
--- a/keyboards/xelus/xs60/hotswap/rules.mk
+++ b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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 = yes
-
-LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xelus/xs60/info.json b/keyboards/xelus/xs60/info.json
new file mode 100644
index 00000000000..719cf2aac12
--- /dev/null
+++ b/keyboards/xelus/xs60/info.json
@@ -0,0 +1,19 @@
+{
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    }
+}
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index 5b966800c68..8ab23ab40cf 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 // I2C setup
 #define I2C1_SCL_PAL_MODE   4
 #define I2C1_SDA_PAL_MODE   4
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/keyboard.json
similarity index 100%
rename from keyboards/xelus/xs60/soldered/info.json
rename to keyboards/xelus/xs60/soldered/keyboard.json
diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk
index f632b896ab1..3aa0e2bf061 100644
--- a/keyboards/xelus/xs60/soldered/rules.mk
+++ b/keyboards/xelus/xs60/soldered/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = 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 = yes
-
-LTO_ENABLE = yes
 OPT = 2
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
deleted file mode 100644
index 4a0752d3718..00000000000
--- a/keyboards/xenon/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Kyrre Havik Eriksen
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#ifdef OLED_ENABLE
-  #define OLED_DISPLAY_128X32
-#endif
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
deleted file mode 100644
index 2bc916fde4a..00000000000
--- a/keyboards/xenon/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "keyboard_name": "Xenon",
-  "manufacturer": "narinari",
-  "url": "https://github.com/narinari/xenon-keyboard",
-  "maintainer": "Kyrremann",
-  "usb": {
-    "vid": "0xFEED",
-    "pid": "0x3404",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
-    "rows": ["D4", "C6", "D7", "E6", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "B6", "pin_b": "B5"}
-    ]
-  },
-  "split": {
-    "soft_serial_pin": "D2"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "caterina",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"matrix": [0, 6], "x": 0, "y": 0.75},
-        {"matrix": [0, 5], "x": 1, "y": 0.75},
-        {"matrix": [0, 4], "x": 2, "y": 0.25},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 2], "x": 4, "y": 0.25},
-        {"matrix": [0, 1], "x": 5, "y": 0.5},
-
-        {"matrix": [5, 1], "x": 9, "y": 0.5},
-        {"matrix": [5, 2], "x": 10, "y": 0.25},
-        {"matrix": [5, 3], "x": 11, "y": 0},
-        {"matrix": [5, 4], "x": 12, "y": 0.25},
-        {"matrix": [5, 5], "x": 13, "y": 0.75},
-        {"matrix": [5, 6], "x": 14, "y": 0.75},
-
-        {"matrix": [1, 6], "x": 0, "y": 1.75},
-        {"matrix": [1, 5], "x": 1, "y": 1.75},
-        {"matrix": [1, 4], "x": 2, "y": 1.25},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 2], "x": 4, "y": 1.25},
-        {"matrix": [1, 1], "x": 5, "y": 1.5},
-
-        {"matrix": [6, 1], "x": 9, "y": 1.5},
-        {"matrix": [6, 2], "x": 10, "y": 1.25},
-        {"matrix": [6, 3], "x": 11, "y": 1},
-        {"matrix": [6, 4], "x": 12, "y": 1.25},
-        {"matrix": [6, 5], "x": 13, "y": 1.75},
-        {"matrix": [6, 6], "x": 14, "y": 1.75},
-
-        {"matrix": [2, 6], "x": 0, "y": 2.75},
-        {"matrix": [2, 5], "x": 1, "y": 2.75},
-        {"matrix": [2, 4], "x": 2, "y": 2.25},
-        {"matrix": [2, 3], "x": 3, "y": 2},
-        {"matrix": [2, 2], "x": 4, "y": 2.25},
-        {"matrix": [2, 1], "x": 5, "y": 2.5},
-
-        {"matrix": [7, 1], "x": 9, "y": 2.5},
-        {"matrix": [7, 2], "x": 10, "y": 2.25},
-        {"matrix": [7, 3], "x": 11, "y": 2},
-        {"matrix": [7, 4], "x": 12, "y": 2.25},
-        {"matrix": [7, 5], "x": 13, "y": 2.75},
-        {"matrix": [7, 6], "x": 14, "y": 2.75},
-
-        {"matrix": [3, 4], "x": 2, "y": 3.25},
-        {"matrix": [3, 3], "x": 3, "y": 3},
-        {"matrix": [3, 2], "x": 4, "y": 3.25},
-        {"matrix": [3, 1], "x": 5, "y": 3.5},
-        {"matrix": [3, 0], "x": 6, "y": 3.5},
-
-        {"matrix": [8, 0], "x": 8, "y": 3.5},
-        {"matrix": [8, 1], "x": 9, "y": 3.5},
-        {"matrix": [8, 2], "x": 10, "y": 3.25},
-        {"matrix": [8, 3], "x": 11, "y": 3},
-        {"matrix": [8, 4], "x": 12, "y": 3.25},
-
-        {"matrix": [4, 3], "x": 3, "y": 4},
-        {"matrix": [4, 2], "x": 4, "y": 4.25},
-        {"matrix": [4, 1], "x": 5, "y": 4.5},
-        {"matrix": [4, 0], "x": 6, "y": 4.5},
-
-        {"matrix": [9, 0], "x": 8, "y": 4.5},
-        {"matrix": [9, 1], "x": 9, "y": 4.5},
-        {"matrix": [9, 2], "x": 10, "y": 4.25},
-        {"matrix": [9, 3], "x": 11, "y": 4}
-      ]
-    }
-  }
-}
diff --git a/keyboards/xenon/keyboard.json b/keyboards/xenon/keyboard.json
new file mode 100644
index 00000000000..7f78988525a
--- /dev/null
+++ b/keyboards/xenon/keyboard.json
@@ -0,0 +1,111 @@
+{
+  "keyboard_name": "Xenon",
+  "manufacturer": "narinari",
+  "url": "https://github.com/narinari/xenon-keyboard",
+  "maintainer": "Kyrremann",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3404",
+    "device_version": "0.0.1"
+  },
+  "features": {
+    "bootmagic": false,
+    "console": true,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": false,
+    "oled": true
+  },
+  "qmk": {
+    "locking": {
+        "enabled": true,
+        "resync": true
+    }
+  },
+  "matrix_pins": {
+    "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+    "rows": ["D4", "C6", "D7", "E6", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B6", "pin_b": "B5"}
+    ]
+  },
+  "split": {
+    "enabled": true,
+    "soft_serial_pin": "D2"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 6], "x": 0, "y": 0.75},
+        {"matrix": [0, 5], "x": 1, "y": 0.75},
+        {"matrix": [0, 4], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0.25},
+        {"matrix": [0, 1], "x": 5, "y": 0.5},
+
+        {"matrix": [5, 1], "x": 9, "y": 0.5},
+        {"matrix": [5, 2], "x": 10, "y": 0.25},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 4], "x": 12, "y": 0.25},
+        {"matrix": [5, 5], "x": 13, "y": 0.75},
+        {"matrix": [5, 6], "x": 14, "y": 0.75},
+
+        {"matrix": [1, 6], "x": 0, "y": 1.75},
+        {"matrix": [1, 5], "x": 1, "y": 1.75},
+        {"matrix": [1, 4], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1.25},
+        {"matrix": [1, 1], "x": 5, "y": 1.5},
+
+        {"matrix": [6, 1], "x": 9, "y": 1.5},
+        {"matrix": [6, 2], "x": 10, "y": 1.25},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 4], "x": 12, "y": 1.25},
+        {"matrix": [6, 5], "x": 13, "y": 1.75},
+        {"matrix": [6, 6], "x": 14, "y": 1.75},
+
+        {"matrix": [2, 6], "x": 0, "y": 2.75},
+        {"matrix": [2, 5], "x": 1, "y": 2.75},
+        {"matrix": [2, 4], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2.25},
+        {"matrix": [2, 1], "x": 5, "y": 2.5},
+
+        {"matrix": [7, 1], "x": 9, "y": 2.5},
+        {"matrix": [7, 2], "x": 10, "y": 2.25},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 4], "x": 12, "y": 2.25},
+        {"matrix": [7, 5], "x": 13, "y": 2.75},
+        {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+        {"matrix": [3, 4], "x": 2, "y": 3.25},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3.25},
+        {"matrix": [3, 1], "x": 5, "y": 3.5},
+        {"matrix": [3, 0], "x": 6, "y": 3.5},
+
+        {"matrix": [8, 0], "x": 8, "y": 3.5},
+        {"matrix": [8, 1], "x": 9, "y": 3.5},
+        {"matrix": [8, 2], "x": 10, "y": 3.25},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3.25},
+
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 2], "x": 4, "y": 4.25},
+        {"matrix": [4, 1], "x": 5, "y": 4.5},
+        {"matrix": [4, 0], "x": 6, "y": 4.5},
+
+        {"matrix": [9, 0], "x": 8, "y": 4.5},
+        {"matrix": [9, 1], "x": 9, "y": 4.5},
+        {"matrix": [9, 2], "x": 10, "y": 4.25},
+        {"matrix": [9, 3], "x": 11, "y": 4}
+      ]
+    }
+  }
+}
diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk
deleted file mode 100644
index 190ff6ca62b..00000000000
--- a/keyboards/xenon/rules.mk
+++ /dev/null
@@ -1,15 +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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
index 093618f2b33..fc20837593b 100644
--- a/keyboards/xiaomi/mk02/config.h
+++ b/keyboards/xiaomi/mk02/config.h
@@ -18,19 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
deleted file mode 100644
index 16cbfd1703b..00000000000
--- a/keyboards/xiaomi/mk02/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "MK02",
-    "manufacturer": "Xiaomi",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0B91",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
-        "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
-    },
-    "diode_direction": "ROW2COL",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [0, 2], "x": 3, "y": 0},
-                {"matrix": [0, 3], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6.5, "y": 0},
-                {"matrix": [0, 6], "x": 7.5, "y": 0},
-                {"matrix": [0, 7], "x": 8.5, "y": 0},
-                {"matrix": [0, 8], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xiaomi/mk02/keyboard.json b/keyboards/xiaomi/mk02/keyboard.json
new file mode 100644
index 00000000000..28d5d8a17d3
--- /dev/null
+++ b/keyboards/xiaomi/mk02/keyboard.json
@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "MK02",
+    "manufacturer": "Xiaomi",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0B91",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F072",
+    "bootloader": "custom",
+    "matrix_pins": {
+        "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
+        "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
+    },
+    "diode_direction": "ROW2COL",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk
index c20d67dd89d..5920e3de5fa 100644
--- a/keyboards/xiaomi/mk02/rules.mk
+++ b/keyboards/xiaomi/mk02/rules.mk
@@ -1,19 +1,6 @@
-# MCU name
-MCU = STM32F072
+# custom bootloader
 BOARD = ST_STM32F072B_DISCOVERY
 MCU_LDSCRIPT = STM32F072_0x2000_bootloader
 
-# Bootloader selection
-BOOTLOADER = custom
-
 DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave
 DFU_SUFFIX_ARGS = -v 0483 -p DF11
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = no	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
deleted file mode 100644
index 1e0b22f96b1..00000000000
--- a/keyboards/xiudi/xd002/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "keyboard_name": "XD002",
-  "manufacturer": "XIUDI",
-  "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
-  "maintainer": "zvecr",
-  "usb": {
-    "vid": "0x7844",
-    "pid": "0x0202",
-    "device_version": "0.0.1"
-  },
-  "rgblight": {
-    "led_count": 2
-  },
-  "ws2812": {
-    "pin": "B2"
-  },
-  "matrix_pins": {
-    "direct": [
-      ["B0", "B1"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]}
-      ]
-    }
-  }
-}
diff --git a/keyboards/xiudi/xd002/keyboard.json b/keyboards/xiudi/xd002/keyboard.json
new file mode 100644
index 00000000000..98b06cb84ac
--- /dev/null
+++ b/keyboards/xiudi/xd002/keyboard.json
@@ -0,0 +1,40 @@
+{
+  "keyboard_name": "XD002",
+  "manufacturer": "XIUDI",
+  "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
+  "maintainer": "zvecr",
+  "usb": {
+    "vid": "0x7844",
+    "pid": "0x0202",
+    "device_version": "0.0.1"
+  },
+  "processor": "attiny85",
+  "bootloader": "custom",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "grave_esc": false,
+    "magic": false,
+    "space_cadet": false
+  },
+  "rgblight": {
+    "led_count": 2
+  },
+  "ws2812": {
+    "pin": "B2"
+  },
+  "matrix_pins": {
+    "direct": [
+      ["B0", "B1"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]}
+      ]
+    }
+  }
+}
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
index 70c620c8f06..e31f5d531fd 100644
--- a/keyboards/xiudi/xd002/rules.mk
+++ b/keyboards/xiudi/xd002/rules.mk
@@ -1,26 +1,3 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
+# custom bootloader
 OPT_DEFS += -DBOOTLOADER_SIZE=1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 0ad3910060c..e40e570c14d 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -16,28 +16,6 @@
 
 #pragma once
 
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
deleted file mode 100644
index b97efe9cf85..00000000000
--- a/keyboards/xiudi/xd84/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "keyboard_name": "XD84",
-    "manufacturer": "KPrepublic",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x7844",
-        "pid": "0x8484",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 10,
-        "on_state": 0
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "rgblight": {
-        "led_count": 7,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["75_ansi", "75_iso"],
-    "layouts": {
-        "LAYOUT_75_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 8], "x": 12, "y": 5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 14], "x": 15, "y": 5}
-            ]
-        },
-        "LAYOUT_75_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-                {"matrix": [1, 12], "x": 12, "y": 1},
-                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5},
-                {"matrix": [5, 11], "x": 11, "y": 5},
-                {"matrix": [5, 8], "x": 12, "y": 5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 14], "x": 15, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xiudi/xd84/keyboard.json b/keyboards/xiudi/xd84/keyboard.json
new file mode 100644
index 00000000000..0411869633d
--- /dev/null
+++ b/keyboards/xiudi/xd84/keyboard.json
@@ -0,0 +1,247 @@
+{
+    "keyboard_name": "XD84",
+    "manufacturer": "KPrepublic",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x7844",
+        "pid": "0x8484",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 10,
+        "on_state": 0
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "rgblight": {
+        "led_count": 7,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["75_ansi", "75_iso"],
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 8], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c
index d92ac83b4a7..ea1b4f55b40 100644
--- a/keyboards/xiudi/xd84/matrix.c
+++ b/keyboards/xiudi/xd84/matrix.c
@@ -13,15 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <string.h>
 #include "matrix.h"
 #include "pca9555.h"
-#include "quantum.h"
-
-#include "debug.h"
 
 // PCA9555 slave addresses
 #define IC1 0x20
diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/xiudi/xd84/rules.mk
+++ b/keyboards/xiudi/xd84/rules.mk
@@ -1,17 +1,3 @@
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 059b57a0c6f..6eb4fc5f58e 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -16,28 +16,6 @@
 
 #pragma once
 
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
deleted file mode 100644
index 2b4ee4aad0a..00000000000
--- a/keyboards/xiudi/xd96/info.json
+++ /dev/null
@@ -1,373 +0,0 @@
-{
-    "keyboard_name": "XD96",
-    "manufacturer": "KPrepublic",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x7844",
-        "pid": "0x9696",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B5",
-        "levels": 10
-    },
-    "rgblight": {
-        "led_count": 16,
-        "max_brightness": 50,
-        "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
-        }
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "num_lock": "C6",
-        "on_state": 0
-    },
-    "ws2812": {
-        "pin": "C7"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_96_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-                {"matrix": [0, 16], "x": 17, "y": 0},
-                {"matrix": [0, 17], "x": 18, "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, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-                {"matrix": [1, 16], "x": 17, "y": 1},
-                {"matrix": [1, 17], "x": 18, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-                {"matrix": [2, 16], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-                {"matrix": [3, 16], "x": 17, "y": 3},
-                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 14], "x": 15, "y": 5},
-                {"matrix": [5, 15], "x": 16, "y": 5},
-                {"matrix": [5, 16], "x": 17, "y": 5},
-                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-            ]
-        },
-        "LAYOUT_96_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [5, 6], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-                {"matrix": [0, 16], "x": 17, "y": 0},
-                {"matrix": [0, 17], "x": 18, "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, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-                {"matrix": [1, 16], "x": 17, "y": 1},
-                {"matrix": [1, 17], "x": 18, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-                {"matrix": [2, 16], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-                {"matrix": [3, 16], "x": 17, "y": 3},
-                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 14], "x": 15, "y": 5},
-                {"matrix": [5, 15], "x": 16, "y": 5},
-                {"matrix": [5, 16], "x": 17, "y": 5},
-                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-            ]
-        },
-        "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": [5, 6], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-                {"matrix": [0, 15], "x": 16, "y": 0},
-                {"matrix": [0, 16], "x": 17, "y": 0},
-                {"matrix": [0, 17], "x": 18, "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": [5, 9], "x": 14, "y": 1},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-                {"matrix": [1, 15], "x": 16, "y": 1},
-                {"matrix": [1, 16], "x": 17, "y": 1},
-                {"matrix": [1, 17], "x": 18, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-                {"matrix": [2, 15], "x": 16, "y": 2},
-                {"matrix": [2, 16], "x": 17, "y": 2},
-                {"matrix": [2, 17], "x": 18, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3},
-                {"matrix": [3, 12], "x": 12.75, "y": 3},
-                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-                {"matrix": [3, 15], "x": 16, "y": 3},
-                {"matrix": [3, 16], "x": 17, "y": 3},
-                {"matrix": [3, 17], "x": 18, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4},
-                {"matrix": [4, 7], "x": 7.25, "y": 4},
-                {"matrix": [4, 8], "x": 8.25, "y": 4},
-                {"matrix": [4, 9], "x": 9.25, "y": 4},
-                {"matrix": [4, 10], "x": 10.25, "y": 4},
-                {"matrix": [4, 11], "x": 11.25, "y": 4},
-                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4},
-                {"matrix": [4, 15], "x": 16, "y": 4},
-                {"matrix": [4, 16], "x": 17, "y": 4},
-                {"matrix": [4, 17], "x": 18, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 12], "x": 13, "y": 5},
-                {"matrix": [5, 13], "x": 14, "y": 5},
-                {"matrix": [5, 14], "x": 15, "y": 5},
-                {"matrix": [5, 15], "x": 16, "y": 5},
-                {"matrix": [5, 16], "x": 17, "y": 5},
-                {"matrix": [5, 17], "x": 18, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/xiudi/xd96/keyboard.json b/keyboards/xiudi/xd96/keyboard.json
new file mode 100644
index 00000000000..df1fd1cfd44
--- /dev/null
+++ b/keyboards/xiudi/xd96/keyboard.json
@@ -0,0 +1,390 @@
+{
+    "keyboard_name": "XD96",
+    "manufacturer": "KPrepublic",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x7844",
+        "pid": "0x9696",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "backlight": {
+        "pin": "B5",
+        "levels": 10
+    },
+    "rgblight": {
+        "led_count": 16,
+        "max_brightness": 50,
+        "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
+        }
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "C6",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "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, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "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, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "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": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "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": [5, 9], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 17], "x": 18, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [5, 17], "x": 18, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c
index 641202ca2c9..2c433f02b8a 100644
--- a/keyboards/xiudi/xd96/matrix.c
+++ b/keyboards/xiudi/xd96/matrix.c
@@ -13,15 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <string.h>
 #include "matrix.h"
 #include "pca9555.h"
-#include "quantum.h"
-
-#include "debug.h"
+#include "wait.h"
 
 // PCA9555 slave addresses
 #define IC1 0x20
diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/xiudi/xd96/rules.mk
+++ b/keyboards/xiudi/xd96/rules.mk
@@ -1,17 +1,3 @@
-# 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 = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes
-
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
index 32516a5ec2b..7bc4f081160 100644
--- a/keyboards/xw60/config.h
+++ b/keyboards/xw60/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-
 #define SOLENOID_PIN F6
 #define SOLENOID_ACTIVE true
 #define SOLENOID_DEFAULT_DWELL 75
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
deleted file mode 100644
index 50315c5ffde..00000000000
--- a/keyboards/xw60/info.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-    "keyboard_name": "XW60",
-    "manufacturer": "Drclick",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-      "vid": "0xFEED",
-      "pid": "0x6060",
-      "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-      "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
-      "rows": ["D0", "D1", "D2", "D3", "D5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-      "LAYOUT": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0},
-          {"matrix": [0, 1], "x": 1, "y": 0},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-          {"matrix": [0, 5], "x": 5, "y": 0},
-          {"matrix": [0, 6], "x": 6, "y": 0},
-          {"matrix": [0, 7], "x": 7, "y": 0},
-          {"matrix": [0, 8], "x": 8, "y": 0},
-          {"matrix": [0, 9], "x": 9, "y": 0},
-          {"matrix": [0, 10], "x": 10, "y": 0},
-          {"matrix": [0, 11], "x": 11, "y": 0},
-          {"matrix": [0, 12], "x": 12, "y": 0},
-          {"matrix": [0, 13], "x": 13, "y": 0},
-          {"matrix": [4, 9], "x": 14, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [1, 10], "x": 10.5, "y": 1},
-          {"matrix": [1, 11], "x": 11.5, "y": 1},
-          {"matrix": [1, 12], "x": 12.5, "y": 1},
-          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-          {"matrix": [2, 1], "x": 1.75, "y": 2},
-          {"matrix": [2, 2], "x": 2.75, "y": 2},
-          {"matrix": [2, 3], "x": 3.75, "y": 2},
-          {"matrix": [2, 4], "x": 4.75, "y": 2},
-          {"matrix": [2, 5], "x": 5.75, "y": 2},
-          {"matrix": [2, 6], "x": 6.75, "y": 2},
-          {"matrix": [2, 7], "x": 7.75, "y": 2},
-          {"matrix": [2, 8], "x": 8.75, "y": 2},
-          {"matrix": [2, 9], "x": 9.75, "y": 2},
-          {"matrix": [2, 10], "x": 10.75, "y": 2},
-          {"matrix": [2, 11], "x": 11.75, "y": 2},
-          {"matrix": [2, 12], "x": 12.75, "y": 2},
-          {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-          {"matrix": [3, 1], "x": 1.25, "y": 3},
-          {"matrix": [3, 2], "x": 2.25, "y": 3},
-          {"matrix": [3, 3], "x": 3.25, "y": 3},
-          {"matrix": [3, 4], "x": 4.25, "y": 3},
-          {"matrix": [3, 5], "x": 5.25, "y": 3},
-          {"matrix": [3, 6], "x": 6.25, "y": 3},
-          {"matrix": [3, 7], "x": 7.25, "y": 3},
-          {"matrix": [3, 8], "x": 8.25, "y": 3},
-          {"matrix": [3, 9], "x": 9.25, "y": 3},
-          {"matrix": [3, 10], "x": 10.25, "y": 3},
-          {"matrix": [3, 11], "x": 11.25, "y": 3},
-          {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-          {"matrix": [3, 12], "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},
-          {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
-          {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
-          {"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}
-        ]
-      },
-      "LAYOUT_pingjunior": {
-        "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": [4, 9], "x": 14, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [1, 10], "x": 10.5, "y": 1},
-          {"matrix": [1, 11], "x": 11.5, "y": 1},
-          {"matrix": [1, 12], "x": 12.5, "y": 1},
-          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-          {"matrix": [2, 1], "x": 1.75, "y": 2},
-          {"matrix": [2, 2], "x": 2.75, "y": 2},
-          {"matrix": [2, 3], "x": 3.75, "y": 2},
-          {"matrix": [2, 4], "x": 4.75, "y": 2},
-          {"matrix": [2, 5], "x": 5.75, "y": 2},
-          {"matrix": [2, 6], "x": 6.75, "y": 2},
-          {"matrix": [2, 7], "x": 7.75, "y": 2},
-          {"matrix": [2, 8], "x": 8.75, "y": 2},
-          {"matrix": [2, 9], "x": 9.75, "y": 2},
-          {"matrix": [2, 10], "x": 10.75, "y": 2},
-          {"matrix": [2, 11], "x": 11.75, "y": 2},
-          {"matrix": [2, 12], "x": 12.75, "y": 2},
-          {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
-          {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
-          {"matrix": [3, 2], "x": 2.25, "y": 3},
-          {"matrix": [3, 3], "x": 3.25, "y": 3},
-          {"matrix": [3, 4], "x": 4.25, "y": 3},
-          {"matrix": [3, 5], "x": 5.25, "y": 3},
-          {"matrix": [3, 6], "x": 6.25, "y": 3},
-          {"matrix": [3, 7], "x": 7.25, "y": 3},
-          {"matrix": [3, 8], "x": 8.25, "y": 3},
-          {"matrix": [3, 9], "x": 9.25, "y": 3},
-          {"matrix": [3, 10], "x": 10.25, "y": 3},
-          {"matrix": [3, 11], "x": 11.25, "y": 3},
-          {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
-          {"matrix": [3, 12], "x": 14, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-          {"matrix": [4, 1], "x": 1.5, "y": 4},
-          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-          {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-          {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-          {"matrix": [4, 12], "x": 12.5, "y": 4},
-          {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/xw60/keyboard.json b/keyboards/xw60/keyboard.json
new file mode 100644
index 00000000000..6316f944e50
--- /dev/null
+++ b/keyboards/xw60/keyboard.json
@@ -0,0 +1,178 @@
+{
+    "keyboard_name": "XW60",
+    "manufacturer": "Drclick",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x6060",
+      "device_version": "0.0.1"
+    },
+    "features": {
+      "bootmagic": true,
+      "extrakey": false,
+      "haptic": true,
+      "mousekey": false,
+      "nkro": true
+    },
+    "qmk": {
+      "locking": {
+          "enabled": true
+      }
+    },
+    "matrix_pins": {
+      "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+      "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+      "LAYOUT": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [4, 9], "x": 14, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 12], "x": 12.75, "y": 2},
+          {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 12], "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},
+          {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+          {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
+          {"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}
+        ]
+      },
+      "LAYOUT_pingjunior": {
+        "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": [4, 9], "x": 14, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 12], "x": 12.75, "y": 2},
+          {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+          {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 12], "x": 14, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+          {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+          {"matrix": [4, 12], "x": 12.5, "y": 4},
+          {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk
index 710fb4ca887..a521203b326 100644
--- a/keyboards/xw60/rules.mk
+++ b/keyboards/xw60/rules.mk
@@ -1,14 +1 @@
-# 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 = 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
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-HAPTIC_ENABLE = yes
 HAPTIC_DRIVER = solenoid
diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json
deleted file mode 100644
index bf9841492d9..00000000000
--- a/keyboards/yampad/info.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "keyboard_name": "Yampad",
-    "manufacturer": "Mattia Dal Ben",
-    "url": "",
-    "maintainer": "mattdibi",
-    "usb": {
-        "vid": "0x5950",
-        "pid": "0x8369",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 9,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "F4"
-    },
-    "build": {
-        "debounce_type": "sym_eager_pk"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B3", "B2", "B6"],
-        "rows": ["C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "debounce": 2,
-    "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, 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": [1, 3], "x": 3, "y": 1, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "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": 3, "h": 2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yampad/keyboard.json b/keyboards/yampad/keyboard.json
new file mode 100644
index 00000000000..76efef72ad9
--- /dev/null
+++ b/keyboards/yampad/keyboard.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "Yampad",
+    "manufacturer": "Mattia Dal Ben",
+    "url": "",
+    "maintainer": "mattdibi",
+    "usb": {
+        "vid": "0x5950",
+        "pid": "0x8369",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "nkro": true,
+        "oled": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 9,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "F4"
+    },
+    "build": {
+        "lto": true,
+        "debounce_type": "sym_eager_pk"
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "debounce": 2,
+    "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, 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": [1, 3], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "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": 3, "h": 2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk
deleted file mode 100644
index 498bf77b977..00000000000
--- a/keyboards/yampad/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-AUDIO_ENABLE = no           # Audio output
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-COMMAND_ENABLE = no         # Commands for debug and configuration
-CONSOLE_ENABLE = no         # Console for debug
-EXTRAKEY_ENABLE = no        # Audio control and System control
-LTO_ENABLE = yes            # Link time optimise, reduce firmware size
-MOUSEKEY_ENABLE = no        # Mouse keys
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-OLED_ENABLE = yes
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json
deleted file mode 100644
index 9fe09cd95b9..00000000000
--- a/keyboards/yandrstudio/buff67v3/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "buff67v3",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA88",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B4",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"],
-        "rows": ["A3", "A4", "A5", "A7", "C15"]
-    },
-    "diode_direction": "COL2ROW",
-    "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, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/buff67v3/keyboard.json b/keyboards/yandrstudio/buff67v3/keyboard.json
new file mode 100644
index 00000000000..918bc7b0e7c
--- /dev/null
+++ b/keyboards/yandrstudio/buff67v3/keyboard.json
@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "buff67v3",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA88",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B4",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"],
+        "rows": ["A3", "A4", "A5", "A7", "C15"]
+    },
+    "diode_direction": "COL2ROW",
+    "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, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
index 276c0738895..d802dd3c05b 100644
--- a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
index 7ee3017117f..2d60e61302a 100644
--- a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, GUI_TOG,KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, GU_TOGG,KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk
index 421ae9fce11..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/buff67v3/rules.mk
+++ b/keyboards/yandrstudio/buff67v3/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json
deleted file mode 100644
index 39eeac8564b..00000000000
--- a/keyboards/yandrstudio/eau87/info.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-    "keyboard_name": "eau87",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAAEB",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"],
-        "rows": ["B12", "B5", "B4", "A4", "B7", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-                {"matrix": [0, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/eau87/keyboard.json b/keyboards/yandrstudio/eau87/keyboard.json
new file mode 100644
index 00000000000..ec91989d0f2
--- /dev/null
+++ b/keyboards/yandrstudio/eau87/keyboard.json
@@ -0,0 +1,126 @@
+{
+    "keyboard_name": "eau87",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAAEB",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"],
+        "rows": ["B12", "B5", "B4", "A4", "B7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/eau87/rules.mk b/keyboards/yandrstudio/eau87/rules.mk
index 4a92d0f891c..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/eau87/rules.mk
+++ b/keyboards/yandrstudio/eau87/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
deleted file mode 100644
index c3aaf39e2d8..00000000000
--- a/keyboards/yandrstudio/eau_r2/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "keyboard_name": "eau75",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAACD",
-        "device_version": "1.0.0"
-    },
-    "matrix_pins": {
-        "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"],
-        "rows": ["A3", "B9", "B8", "A4", "C14", "C13"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "A8"
-    },
-    "rgblight": {
-        "brightness_steps": 5,
-        "led_count": 12,
-        "max_brightness": 200,
-        "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
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        }
-    },
-    "debounce": 8,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [0, 7], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [0, 9], "x": 8.5, "y": 0},
-                {"matrix": [0, 10], "x": 9.5, "y": 0},
-
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
-
-                {"matrix": [0, 15], "x": 15.25, "y": 0},
-                {"matrix": [0, 16], "x": 16.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 16.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/eau_r2/keyboard.json b/keyboards/yandrstudio/eau_r2/keyboard.json
new file mode 100644
index 00000000000..78f7dc108c4
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keyboard.json
@@ -0,0 +1,148 @@
+{
+    "keyboard_name": "eau75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAACD",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"],
+        "rows": ["A3", "B9", "B8", "A4", "C14", "C13"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "A8"
+    },
+    "rgblight": {
+        "brightness_steps": 5,
+        "led_count": 12,
+        "max_brightness": 200,
+        "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
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        }
+    },
+    "debounce": 8,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/eau_r2/rules.mk b/keyboards/yandrstudio/eau_r2/rules.mk
index 421ae9fce11..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/eau_r2/rules.mk
+++ b/keyboards/yandrstudio/eau_r2/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json
deleted file mode 100644
index 956016a7e6d..00000000000
--- a/keyboards/yandrstudio/nightstar75/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "keyboard_name": "nightstar75",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA87",
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "rgblight": {
-        "led_count": 4,
-        "max_brightness": 180,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        },
-        "layers": {
-            "enabled": true,
-            "override_rgb": true
-        }
-    },
-    "matrix_pins": {
-        "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"],
-        "rows": ["B0", "B1", "B2", "B10", "B11", "B9"]
-    },
-    "diode_direction": "ROW2COL",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.5},
-                {"matrix": [1, 1], "x": 1, "y": 1.5},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1.5},
-                {"matrix": [1, 4], "x": 4, "y": 1.5},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-                {"matrix": [1, 6], "x": 6, "y": 1.5},
-                {"matrix": [1, 7], "x": 7, "y": 1.5},
-                {"matrix": [1, 8], "x": 8, "y": 1.5},
-                {"matrix": [1, 9], "x": 9, "y": 1.5},
-                {"matrix": [1, 10], "x": 10, "y": 1.5},
-                {"matrix": [1, 11], "x": 11, "y": 1.5},
-                {"matrix": [1, 12], "x": 12, "y": 1.5},
-                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-                {"matrix": [1, 14], "x": 15, "y": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-                {"matrix": [2, 14], "x": 15, "y": 2.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-                {"matrix": [3, 14], "x": 15, "y": 3.5},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
-                {"matrix": [4, 13], "x": 14, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
-                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
-
-                {"matrix": [5, 12], "x": 13, "y": 5.5},
-                {"matrix": [5, 13], "x": 14, "y": 5.5},
-                {"matrix": [5, 14], "x": 15, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/nightstar75/keyboard.json b/keyboards/yandrstudio/nightstar75/keyboard.json
new file mode 100644
index 00000000000..d356b81fd5c
--- /dev/null
+++ b/keyboards/yandrstudio/nightstar75/keyboard.json
@@ -0,0 +1,142 @@
+{
+    "keyboard_name": "nightstar75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA87",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgblight": {
+        "led_count": 4,
+        "max_brightness": 180,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"],
+        "rows": ["B0", "B1", "B2", "B10", "B11", "B9"]
+    },
+    "diode_direction": "ROW2COL",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5.5},
+                {"matrix": [5, 13], "x": 14, "y": 5.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk
index 421ae9fce11..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/nightstar75/rules.mk
+++ b/keyboards/yandrstudio/nightstar75/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
index 3ecbcf83621..9283a3f9751 100644
--- a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
     KC_GRV , KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
index 284a06cacd6..c9817118187 100644
--- a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT(
     KC_GRV , KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
   [2] = LAYOUT(
diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json
deleted file mode 100644
index 372330eb68f..00000000000
--- a/keyboards/yandrstudio/nz67v2/info.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
-    "keyboard_name": "nz67v2",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA83",
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "B5",
-        "driver": "pwm"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
-        "rows": ["B3", "B4", "B6", "B7", "B8"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "A9", "pin_b": "A10"}
-        ]
-    },
-    "qmk": {
-        "tap_keycode_delay": 15
-    },
-    "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, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
-                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        },
-        "LAYOUT_65_ansi_blocker_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, "y": 0, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
-                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/nz67v2/keyboard.json b/keyboards/yandrstudio/nz67v2/keyboard.json
new file mode 100644
index 00000000000..fc931f3427a
--- /dev/null
+++ b/keyboards/yandrstudio/nz67v2/keyboard.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "nz67v2",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA83",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 180,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+        "rows": ["B3", "B4", "B6", "B7", "B8"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A9", "pin_b": "A10"}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 15
+    },
+    "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, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_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, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
index f1069c37db6..522b8d1043d 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
index 52e0d15c8e5..d417fdb8ba8 100644
--- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, URGB_K,  RGB_HUI, RGB_HUD, RGB_SAI,  RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS,          RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT_all(
diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk
index ba2d7ccbc32..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/nz67v2/rules.mk
+++ b/keyboards/yandrstudio/nz67v2/rules.mk
@@ -1,17 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
-ENCODER_ENABLE = yes        # Rotary encoder support
diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json
deleted file mode 100644
index 0e4a0f62434..00000000000
--- a/keyboards/yandrstudio/tg67/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "keyboard_name": "tg67",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA8D",
-        "device_version": "1.0.0"
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 250,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
-        "rows": ["B0", "B6", "B1", "B7", "A1"]
-    },
-    "diode_direction": "COL2ROW",
-    "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, "w": 2},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [1, 14], "x": 15, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [2, 14], "x": 15, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"matrix": [3, 14], "x": 15, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4},
-                {"matrix": [4, 14], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/tg67/keyboard.json b/keyboards/yandrstudio/tg67/keyboard.json
new file mode 100644
index 00000000000..8a1df37805d
--- /dev/null
+++ b/keyboards/yandrstudio/tg67/keyboard.json
@@ -0,0 +1,153 @@
+{
+    "keyboard_name": "tg67",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA8D",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 250,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"],
+        "rows": ["B0", "B6", "B1", "B7", "A1"]
+    },
+    "diode_direction": "COL2ROW",
+    "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, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk
index 8aabb4f22e0..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/tg67/rules.mk
+++ b/keyboards/yandrstudio/tg67/rules.mk
@@ -1,16 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB Matrix
diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/info.json
deleted file mode 100644
index d055dc00486..00000000000
--- a/keyboards/yandrstudio/wave75/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "keyboard_name": "wave75",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA8E",
-        "device_version": "1.0.0"
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"],
-        "rows": ["A9", "A10", "C15", "A8", "B1", "A1"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/wave75/keyboard.json b/keyboards/yandrstudio/wave75/keyboard.json
new file mode 100644
index 00000000000..8455eb11886
--- /dev/null
+++ b/keyboards/yandrstudio/wave75/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "wave75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA8E",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"],
+        "rows": ["A9", "A10", "C15", "A8", "B1", "A1"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c
index d9201d06cf6..766d1421e11 100644
--- a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c
@@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, GUI_TOG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS, GU_TOGG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c
index 47b133af1e2..56f2c6229d5 100644
--- a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, GUI_TOG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, GU_TOGG,   KC_TRNS,                            KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
     [2] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/yandrstudio/wave75/rules.mk b/keyboards/yandrstudio/wave75/rules.mk
index 4a92d0f891c..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/wave75/rules.mk
+++ b/keyboards/yandrstudio/wave75/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
deleted file mode 100644
index 7f5308f50a7..00000000000
--- a/keyboards/yandrstudio/yr6095/info.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-    "keyboard_name": "YR6095",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA0C",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        },
-        "layers": {
-            "enabled": true,
-            "override_rgb": true
-        }
-    },
-    "ws2812": {
-        "pin": "B5",
-        "driver": "pwm"
-    },
-    "matrix_pins": {
-        "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"],
-        "rows": ["A1", "A3", "A8", "A9", "A10"]
-    },
-    "diode_direction": "COL2ROW",
-    "layouts": {
-        "LAYOUT_60_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": [4, 7], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "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": [4, 7], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
-                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
-                {"matrix": [4, 8], "x": 10, "y": 4},
-                {"matrix": [4, 9], "x": 11, "y": 4},
-                {"matrix": [4, 10], "x": 12, "y": 4},
-                {"matrix": [4, 11], "x": 13, "y": 4},
-                {"matrix": [4, 12], "x": 14, "y": 4},
-
-                {"matrix": [4, 13], "x": 4, "y": 5, "w": 7}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/yr6095/keyboard.json b/keyboards/yandrstudio/yr6095/keyboard.json
new file mode 100644
index 00000000000..7a5d11181ef
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keyboard.json
@@ -0,0 +1,196 @@
+{
+    "keyboard_name": "YR6095",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA0C",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        }
+    },
+    "ws2812": {
+        "pin": "B5",
+        "driver": "pwm"
+    },
+    "matrix_pins": {
+        "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["A1", "A3", "A8", "A9", "A10"]
+    },
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT_60_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": [4, 7], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "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": [4, 7], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+
+                {"matrix": [4, 13], "x": 4, "y": 5, "w": 7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
index 3347731f2bb..812270b13bd 100644
--- a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
@@ -27,5 +27,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, GUI_TOG,   KC_TRNS,                    KC_TRNS,                                      KC_TRNS,          KC_TRNS, KC_TRNS)
+    KC_TRNS, GU_TOGG,   KC_TRNS,                    KC_TRNS,                                      KC_TRNS,          KC_TRNS, KC_TRNS)
 };
diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
index 7bb2ef62657..50b4ed8d353 100644
--- a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, GUI_TOG,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    KC_TRNS, GU_TOGG,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
   [2] = LAYOUT_all(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk
index 421ae9fce11..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/yr6095/rules.mk
+++ b/keyboards/yandrstudio/yr6095/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json
deleted file mode 100644
index 3581fa9d1c8..00000000000
--- a/keyboards/yandrstudio/yr80/info.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-    "keyboard_name": "YR80",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "usb": {
-        "pid": "0xAA0D",
-        "device_version": "1.0.0"
-    },
-    "rgblight": {
-        "led_count": 1,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        },
-        "default": {
-            "animation": "rainbow_mood"
-        },
-        "layers": {
-            "enabled": true,
-            "override_rgb": true
-        }
-    },
-    "ws2812": {
-        "pin": "A7",
-        "driver": "pwm"
-    },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["B12", "B13", "B14", "A15", "B3", "B4", "B5", "B0", "A5", "A4", "A3", "A1", "A2", "B11", "B1", "B2", "B10"],
-        "rows": ["B15", "B6", "B7", "B8", "B9", "A6"]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-
-                {"matrix": [0, 5], "x": 5.5, "y": 0},
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 7], "x": 7.5, "y": 0},
-                {"matrix": [0, 8], "x": 8.5, "y": 0},
-
-                {"matrix": [0, 9], "x": 9.75, "y": 0},
-                {"matrix": [0, 10], "x": 10.75, "y": 0},
-                {"matrix": [0, 11], "x": 11.75, "y": 0},
-                {"matrix": [0, 12], "x": 12.75, "y": 0},
-
-                {"matrix": [0, 13], "x": 14, "y": 0},
-
-                {"matrix": [0, 14], "x": 15.25, "y": 0},
-                {"matrix": [0, 15], "x": 16.25, "y": 0},
-                {"matrix": [0, 16], "x": 17.25, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1.25},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-                {"matrix": [1, 7], "x": 7, "y": 1.25},
-                {"matrix": [1, 8], "x": 8, "y": 1.25},
-                {"matrix": [1, 9], "x": 9, "y": 1.25},
-                {"matrix": [1, 10], "x": 10, "y": 1.25},
-                {"matrix": [1, 11], "x": 11, "y": 1.25},
-                {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
-                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
-                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
-                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
-                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
-                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
-                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
-                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
-                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
-                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
-                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
-                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
-                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
-                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
-                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
-                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 7], "x": 10, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 9], "x": 12.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 10], "x": 13.75, "y": 5.25, "w": 1.25},
-
-                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
-                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
-                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yandrstudio/yr80/keyboard.json b/keyboards/yandrstudio/yr80/keyboard.json
new file mode 100644
index 00000000000..abf552af5c9
--- /dev/null
+++ b/keyboards/yandrstudio/yr80/keyboard.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "YR80",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAA0D",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "rgblight": {
+        "led_count": 1,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
+        }
+    },
+    "ws2812": {
+        "pin": "A7",
+        "driver": "pwm"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B12", "B13", "B14", "A15", "B3", "B4", "B5", "B0", "A5", "A4", "A3", "A1", "A2", "B11", "B1", "B2", "B10"],
+        "rows": ["B15", "B6", "B7", "B8", "B9", "A6"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 7], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk
index 421ae9fce11..04fe1eba2ac 100644
--- a/keyboards/yandrstudio/yr80/rules.mk
+++ b/keyboards/yandrstudio/yr80/rules.mk
@@ -1,15 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
deleted file mode 100644
index 75aa8fffafe..00000000000
--- a/keyboards/ydkb/grape/info.json
+++ /dev/null
@@ -1,1289 +0,0 @@
-{
-    "keyboard_name": "Grape",
-    "manufacturer": "YDKB",
-    "url": "https://item.taobao.com/item.htm?id=642205244150",
-    "maintainer": "Gacathon",
-    "usb": {
-        "vid": "0x5945",
-        "pid": "0x6772",
-        "device_version": "0.0.1"
-    },
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "dynamic_keymap": {
-        "layer_count": 3
-    },
-    "rgblight": {
-        "led_count": 4
-    },
-    "ws2812": {
-        "pin": "E6"
-    },
-    "indicators": {
-        "caps_lock": "F0",
-        "num_lock": "F1",
-        "scroll_lock": "E6",
-        "on_state": 0
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
-                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
-                {"label": "Shift", "matrix": [5, 1], "x": 1.25, "y": 6},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
-                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
-                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
-                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
-                {"label": "Space", "matrix": [6, 4], "x": 3, "y": 7, "w": 3},
-                {"label": "Space", "matrix": [6, 5], "x": 6, "y": 7, "w": 3},
-                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
-                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
-                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
-                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
-                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
-                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
-                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
-                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
-                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
-                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
-                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
-                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
-                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
-                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
-                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_ansi_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
-                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
-                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_ansi_wkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
-                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
-                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
-                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
-                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
-                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
-                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
-                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
-                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
-                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
-                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_iso_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
-                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
-                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
-                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
-                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
-                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
-                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
-                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
-                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_iso_wkl": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
-                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
-                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
-                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        },
-        "LAYOUT_iso_wkl_split_bs": {
-            "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
-                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
-
-                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
-                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
-                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
-
-                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
-
-                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
-                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
-                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
-                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
-
-                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
-                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
-                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
-                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
-                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
-                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
-
-                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
-
-                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
-                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
-                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
-                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
-
-                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
-                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
-                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
-                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
-
-                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
-                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
-                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
-                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
-                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
-                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
-                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
-                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
-                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
-                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
-                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
-                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
-                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
-                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
-                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
-
-                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
-                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
-                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
-                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
-
-                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
-                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
-                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
-                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
-                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
-                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
-                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
-                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
-                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
-                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
-                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
-                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
-
-                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
-                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
-                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
-                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
-
-                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
-                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
-                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
-                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
-                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
-                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
-                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
-                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
-                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
-                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
-                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
-                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
-                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
-                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
-
-                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
-                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
-                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
-
-                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
-                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
-                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
-                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
-                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
-                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
-                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
-                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
-                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
-                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
-                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
-                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
-                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
-                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
-
-                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
-
-                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
-                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
-                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
-
-                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
-                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
-                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
-                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
-                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
-
-                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
-                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
-                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
-
-                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
-                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ydkb/grape/keyboard.json b/keyboards/ydkb/grape/keyboard.json
new file mode 100644
index 00000000000..f8f0364d93d
--- /dev/null
+++ b/keyboards/ydkb/grape/keyboard.json
@@ -0,0 +1,1296 @@
+{
+    "keyboard_name": "Grape",
+    "manufacturer": "YDKB",
+    "url": "https://item.taobao.com/item.htm?id=642205244150",
+    "maintainer": "Gacathon",
+    "usb": {
+        "vid": "0x5945",
+        "pid": "0x6772",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "rgblight": {
+        "led_count": 4
+    },
+    "ws2812": {
+        "pin": "E6"
+    },
+    "indicators": {
+        "caps_lock": "F0",
+        "num_lock": "F1",
+        "scroll_lock": "E6",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+                {"label": "Shift", "matrix": [5, 1], "x": 1.25, "y": 6},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
+                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
+                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
+                {"label": "Space", "matrix": [6, 4], "x": 3, "y": 7, "w": 3},
+                {"label": "Space", "matrix": [6, 5], "x": 6, "y": 7, "w": 3},
+                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
+                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
+                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
+                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
+                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
+                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
+                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
+                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
+                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
+                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
+                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
+                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
+                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
+                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
+                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+                {"label": "\\", "matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "Enter", "matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 2.25},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
+                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
+                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
+                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
+                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
+                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
+                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
+                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7},
+                {"label": "GUI", "matrix": [6, 1], "x": 1, "y": 7},
+                {"label": "Alt", "matrix": [6, 2], "x": 2, "y": 7},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 6},
+                {"label": "Alt", "matrix": [6, 7], "x": 9, "y": 7},
+                {"label": "GUI", "matrix": [6, 8], "x": 10, "y": 7},
+                {"label": "Menu", "matrix": [6, 9], "x": 11, "y": 7},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 12, "y": 7},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3, "w": 2},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6, "w": 2},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
+                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
+                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0},
+
+                {"label": "Insert", "matrix": [0, 8], "x": 8.5, "y": 0},
+                {"label": "Home", "matrix": [0, 9], "x": 9.5, "y": 0},
+                {"label": "Page Up", "matrix": [0, 10], "x": 10.5, "y": 0},
+                {"label": "Print Screen", "matrix": [0, 11], "x": 11.5, "y": 0},
+
+                {"label": "Pause", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "/", "matrix": [0, 15], "x": 17, "y": 0},
+                {"label": "*", "matrix": [0, 16], "x": 18, "y": 0},
+                {"label": "-", "matrix": [0, 17], "x": 19, "y": 0},
+
+                {"label": "F7", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "F8", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F9", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "F10", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "F11", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "F12", "matrix": [1, 7], "x": 7, "y": 1},
+
+                {"label": "Delete", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "End", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "Page Down", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "Scroll Lock", "matrix": [1, 11], "x": 11.5, "y": 1},
+
+                {"label": "7", "matrix": [1, 14], "x": 16, "y": 1},
+                {"label": "8", "matrix": [1, 15], "x": 17, "y": 1},
+                {"label": "9", "matrix": [1, 16], "x": 18, "y": 1},
+                {"label": "+", "matrix": [1, 17], "x": 19, "y": 1},
+
+                {"label": "4", "matrix": [2, 14], "x": 16, "y": 2},
+                {"label": "5", "matrix": [2, 15], "x": 17, "y": 2},
+                {"label": "6", "matrix": [2, 16], "x": 18, "y": 2},
+                {"label": "+", "matrix": [2, 17], "x": 19, "y": 2},
+
+                {"label": "`", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "1", "matrix": [2, 1], "x": 1, "y": 3},
+                {"label": "2", "matrix": [2, 2], "x": 2, "y": 3},
+                {"label": "3", "matrix": [2, 3], "x": 3, "y": 3},
+                {"label": "4", "matrix": [2, 4], "x": 4, "y": 3},
+                {"label": "5", "matrix": [2, 5], "x": 5, "y": 3},
+                {"label": "6", "matrix": [2, 6], "x": 6, "y": 3},
+                {"label": "7", "matrix": [2, 7], "x": 7, "y": 3},
+                {"label": "8", "matrix": [2, 8], "x": 8, "y": 3},
+                {"label": "9", "matrix": [2, 9], "x": 9, "y": 3},
+                {"label": "0", "matrix": [2, 10], "x": 10, "y": 3},
+                {"label": "-", "matrix": [2, 11], "x": 11, "y": 3},
+                {"label": "=", "matrix": [2, 12], "x": 12, "y": 3},
+                {"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 3},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 3},
+
+                {"label": "1", "matrix": [3, 14], "x": 16, "y": 3},
+                {"label": "2", "matrix": [3, 15], "x": 17, "y": 3},
+                {"label": "3", "matrix": [3, 16], "x": 18, "y": 3},
+                {"label": "Enter", "matrix": [3, 17], "x": 19, "y": 3},
+
+                {"label": "Tab", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 1.5, "y": 4},
+                {"label": "W", "matrix": [3, 2], "x": 2.5, "y": 4},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 4},
+                {"label": "R", "matrix": [3, 4], "x": 4.5, "y": 4},
+                {"label": "T", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "Y", "matrix": [3, 6], "x": 6.5, "y": 4},
+                {"label": "U", "matrix": [3, 7], "x": 7.5, "y": 4},
+                {"label": "I", "matrix": [3, 8], "x": 8.5, "y": 4},
+                {"label": "O", "matrix": [3, 9], "x": 9.5, "y": 4},
+                {"label": "P", "matrix": [3, 10], "x": 10.5, "y": 4},
+                {"label": "[", "matrix": [3, 11], "x": 11.5, "y": 4},
+                {"label": "]", "matrix": [3, 12], "x": 12.5, "y": 4},
+
+                {"label": "0", "matrix": [4, 14], "x": 16, "y": 4},
+                {"label": "0", "matrix": [4, 15], "x": 17, "y": 4},
+                {"label": ".", "matrix": [4, 16], "x": 18, "y": 4},
+                {"label": "Enter", "matrix": [4, 17], "x": 19, "y": 4},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.75},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 5},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 5},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 5},
+                {"label": "F", "matrix": [4, 4], "x": 4.75, "y": 5},
+                {"label": "G", "matrix": [4, 5], "x": 5.75, "y": 5},
+                {"label": "H", "matrix": [4, 6], "x": 6.75, "y": 5},
+                {"label": "J", "matrix": [4, 7], "x": 7.75, "y": 5},
+                {"label": "K", "matrix": [4, 8], "x": 8.75, "y": 5},
+                {"label": "L", "matrix": [4, 9], "x": 9.75, "y": 5},
+                {"label": ";", "matrix": [4, 10], "x": 10.75, "y": 5},
+                {"label": "'", "matrix": [4, 11], "x": 11.75, "y": 5},
+                {"label": "#", "matrix": [4, 13], "x": 12.75, "y": 5},
+                {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25, "h": 2},
+
+                {"label": "F13", "matrix": [5, 15], "x": 16.5, "y": 5.25},
+                {"label": "F14", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"label": "F15", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+
+                {"label": "Shift", "matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+                {"label": "\\", "matrix": [5, 1], "x": 1.25, "y": 6},
+                {"label": "Z", "matrix": [5, 2], "x": 2.25, "y": 6},
+                {"label": "X", "matrix": [5, 3], "x": 3.25, "y": 6},
+                {"label": "C", "matrix": [5, 4], "x": 4.25, "y": 6},
+                {"label": "V", "matrix": [5, 5], "x": 5.25, "y": 6},
+                {"label": "B", "matrix": [5, 6], "x": 6.25, "y": 6},
+                {"label": "N", "matrix": [5, 7], "x": 7.25, "y": 6},
+                {"label": "M", "matrix": [5, 8], "x": 8.25, "y": 6},
+                {"label": ",", "matrix": [5, 9], "x": 9.25, "y": 6},
+                {"label": ".", "matrix": [5, 10], "x": 10.25, "y": 6},
+                {"label": "/", "matrix": [5, 11], "x": 11.25, "y": 6},
+                {"label": "Shift", "matrix": [5, 12], "x": 12.25, "y": 6},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.25, "y": 6},
+
+                {"label": "\u2191", "matrix": [5, 13], "x": 14.5, "y": 6.25},
+
+                {"label": "F16", "matrix": [6, 15], "x": 16.5, "y": 6.25},
+                {"label": "F17", "matrix": [6, 16], "x": 17.5, "y": 6.25},
+                {"label": "F18", "matrix": [6, 17], "x": 18.5, "y": 6.25},
+
+                {"label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 7, "w": 1.5},
+                {"label": "Alt", "matrix": [6, 2], "x": 1.5, "y": 7, "w": 1.5},
+                {"label": "Space", "matrix": [6, 5], "x": 3, "y": 7, "w": 7},
+                {"label": "Alt", "matrix": [6, 8], "x": 10, "y": 7, "w": 1.5},
+                {"label": "Ctrl", "matrix": [6, 10], "x": 11.5, "y": 7, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [6, 11], "x": 13.5, "y": 7.25},
+                {"label": "\u2193", "matrix": [6, 12], "x": 14.5, "y": 7.25},
+                {"label": "\u2192", "matrix": [6, 13], "x": 15.5, "y": 7.25},
+
+                {"label": "Mouse 1", "matrix": [5, 14], "x": 17, "y": 7.25},
+                {"label": "Mouse 2", "matrix": [6, 14], "x": 18, "y": 7.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ydkb/grape/matrix.c b/keyboards/ydkb/grape/matrix.c
index 700761fa448..3e070f8d7d5 100644
--- a/keyboards/ydkb/grape/matrix.c
+++ b/keyboards/ydkb/grape/matrix.c
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
-#include <stdbool.h>
 #include "matrix.h"
-#include "quantum.h"
 #include "sn74x138.h"
 
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/ydkb/grape/rules.mk b/keyboards/ydkb/grape/rules.mk
index d1eb5135b4d..6beea3e392f 100644
--- a/keyboards/ydkb/grape/rules.mk
+++ b/keyboards/ydkb/grape/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 VPATH += drivers/gpio
 SRC += matrix.c sn74x138.c
diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json
deleted file mode 100644
index d61f09221a9..00000000000
--- a/keyboards/ydkb/just60/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "keyboard_name": "Just60",
-    "manufacturer": "YDKB",
-    "url": "",
-    "maintainer": "thinxer",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x1960",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"],
-        "rows": ["E2", "C7", "B3", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "qmk_lufa_bootloader": {
-        "esc_input": "E2",
-        "esc_output": "D6"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "lufa-ms",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
-                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 3},
-                {"matrix": [4, 7], "x": 8.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ydkb/just60/keyboard.json b/keyboards/ydkb/just60/keyboard.json
new file mode 100644
index 00000000000..fb46e08ea31
--- /dev/null
+++ b/keyboards/ydkb/just60/keyboard.json
@@ -0,0 +1,99 @@
+{
+    "keyboard_name": "Just60",
+    "manufacturer": "YDKB",
+    "url": "",
+    "maintainer": "thinxer",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1960",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true
+    },
+    "matrix_pins": {
+        "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"],
+        "rows": ["E2", "C7", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "qmk_lufa_bootloader": {
+        "esc_input": "E2",
+        "esc_output": "D6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-ms",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [4, 8], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 3},
+                {"matrix": [4, 7], "x": 8.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ydkb/just60/rules.mk b/keyboards/ydkb/just60/rules.mk
index 2a99e009194..3437a35bdf1 100644
--- a/keyboards/ydkb/just60/rules.mk
+++ b/keyboards/ydkb/just60/rules.mk
@@ -1,15 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-# 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 = 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/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json
deleted file mode 100644
index 99786319b3e..00000000000
--- a/keyboards/yiancardesigns/barleycorn/info.json
+++ /dev/null
@@ -1,311 +0,0 @@
-{
-    "keyboard_name": "Barleycorn",
-    "manufacturer": "Yiancar-Designs",
-    "maintainer": "Yiancar",
-    "usb": {
-      "vid": "0x8968",
-      "pid": "0x4749",
-      "device_version": "0.0.1",
-      "max_power": 100
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "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": [1, 13], "x": 14, "y": 0},
-
-          {"matrix": [0, 14], "x": 15.5, "y": 0},
-          {"matrix": [0, 15], "x": 16.5, "y": 0},
-          {"matrix": [0, 16], "x": 17.5, "y": 0},
-          {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [1, 10], "x": 10.5, "y": 1},
-          {"matrix": [1, 11], "x": 11.5, "y": 1},
-          {"matrix": [1, 12], "x": 12.5, "y": 1},
-          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-          {"matrix": [1, 14], "x": 15.5, "y": 1},
-          {"matrix": [1, 15], "x": 16.5, "y": 1},
-          {"matrix": [1, 16], "x": 17.5, "y": 1},
-          {"matrix": [1, 17], "x": 18.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},
-          {"matrix": [2, 11], "x": 11.75, "y": 2},
-          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-          {"matrix": [2, 14], "x": 15.5, "y": 2},
-          {"matrix": [2, 15], "x": 16.5, "y": 2},
-          {"matrix": [2, 16], "x": 17.5, "y": 2},
-          {"matrix": [2, 17], "x": 18.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},
-          {"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.25, "y": 3.25},
-
-          {"matrix": [3, 14], "x": 15.5, "y": 3},
-          {"matrix": [3, 15], "x": 16.5, "y": 3},
-          {"matrix": [3, 16], "x": 17.5, "y": 3},
-          {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-          {"matrix": [4, 15], "x": 16.5, "y": 4},
-          {"matrix": [4, 16], "x": 17.5, "y": 4},
-          {"matrix": [4, 17], "x": 18.5, "y": 4}
-        ]
-      },
-      "LAYOUT_ansi": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0},
-          {"matrix": [0, 1], "x": 1, "y": 0},
-          {"matrix": [0, 2], "x": 2, "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": [0, 14], "x": 15.5, "y": 0},
-          {"matrix": [0, 15], "x": 16.5, "y": 0},
-          {"matrix": [0, 16], "x": 17.5, "y": 0},
-          {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [1, 10], "x": 10.5, "y": 1},
-          {"matrix": [1, 11], "x": 11.5, "y": 1},
-          {"matrix": [1, 12], "x": 12.5, "y": 1},
-          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
-          {"matrix": [1, 14], "x": 15.5, "y": 1},
-          {"matrix": [1, 15], "x": 16.5, "y": 1},
-          {"matrix": [1, 16], "x": 17.5, "y": 1},
-          {"matrix": [1, 17], "x": 18.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},
-          {"matrix": [2, 11], "x": 11.75, "y": 2},
-          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-          {"matrix": [2, 14], "x": 15.5, "y": 2},
-          {"matrix": [2, 15], "x": 16.5, "y": 2},
-          {"matrix": [2, 16], "x": 17.5, "y": 2},
-          {"matrix": [2, 17], "x": 18.5, "y": 2},
-
-          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-          {"matrix": [3, 2], "x": 2.25, "y": 3},
-          {"matrix": [3, 3], "x": 3.25, "y": 3},
-          {"matrix": [3, 4], "x": 4.25, "y": 3},
-          {"matrix": [3, 5], "x": 5.25, "y": 3},
-          {"matrix": [3, 6], "x": 6.25, "y": 3},
-          {"matrix": [3, 7], "x": 7.25, "y": 3},
-          {"matrix": [3, 8], "x": 8.25, "y": 3},
-          {"matrix": [3, 9], "x": 9.25, "y": 3},
-          {"matrix": [3, 10], "x": 10.25, "y": 3},
-          {"matrix": [3, 11], "x": 11.25, "y": 3},
-          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
-          {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
-          {"matrix": [3, 14], "x": 15.5, "y": 3},
-          {"matrix": [3, 15], "x": 16.5, "y": 3},
-          {"matrix": [3, 16], "x": 17.5, "y": 3},
-          {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-          {"matrix": [4, 15], "x": 16.5, "y": 4},
-          {"matrix": [4, 16], "x": 17.5, "y": 4},
-          {"matrix": [4, 17], "x": 18.5, "y": 4}
-        ]
-      },
-      "LAYOUT_iso": {
-        "layout": [
-          {"matrix": [0, 0], "x": 0, "y": 0},
-          {"matrix": [0, 1], "x": 1, "y": 0},
-          {"matrix": [0, 2], "x": 2, "y": 0},
-          {"matrix": [0, 3], "x": 3, "y": 0},
-          {"matrix": [0, 4], "x": 4, "y": 0},
-          {"matrix": [0, 5], "x": 5, "y": 0},
-          {"matrix": [0, 6], "x": 6, "y": 0},
-          {"matrix": [0, 7], "x": 7, "y": 0},
-          {"matrix": [0, 8], "x": 8, "y": 0},
-          {"matrix": [0, 9], "x": 9, "y": 0},
-          {"matrix": [0, 10], "x": 10, "y": 0},
-          {"matrix": [0, 11], "x": 11, "y": 0},
-          {"matrix": [0, 12], "x": 12, "y": 0},
-          {"matrix": [0, 13], "x": 13, "y": 0},
-          {"matrix": [1, 13], "x": 14, "y": 0},
-
-          {"matrix": [0, 14], "x": 15.5, "y": 0},
-          {"matrix": [0, 15], "x": 16.5, "y": 0},
-          {"matrix": [0, 16], "x": 17.5, "y": 0},
-          {"matrix": [0, 17], "x": 18.5, "y": 0},
-
-          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          {"matrix": [1, 1], "x": 1.5, "y": 1},
-          {"matrix": [1, 2], "x": 2.5, "y": 1},
-          {"matrix": [1, 3], "x": 3.5, "y": 1},
-          {"matrix": [1, 4], "x": 4.5, "y": 1},
-          {"matrix": [1, 5], "x": 5.5, "y": 1},
-          {"matrix": [1, 6], "x": 6.5, "y": 1},
-          {"matrix": [1, 7], "x": 7.5, "y": 1},
-          {"matrix": [1, 8], "x": 8.5, "y": 1},
-          {"matrix": [1, 9], "x": 9.5, "y": 1},
-          {"matrix": [1, 10], "x": 10.5, "y": 1},
-          {"matrix": [1, 11], "x": 11.5, "y": 1},
-          {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-          {"matrix": [1, 14], "x": 15.5, "y": 1},
-          {"matrix": [1, 15], "x": 16.5, "y": 1},
-          {"matrix": [1, 16], "x": 17.5, "y": 1},
-          {"matrix": [1, 17], "x": 18.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},
-          {"matrix": [2, 11], "x": 11.75, "y": 2},
-          {"matrix": [2, 12], "x": 12.75, "y": 2},
-          {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-          {"matrix": [2, 14], "x": 15.5, "y": 2},
-          {"matrix": [2, 15], "x": 16.5, "y": 2},
-          {"matrix": [2, 16], "x": 17.5, "y": 2},
-          {"matrix": [2, 17], "x": 18.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},
-          {"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.25, "y": 3.25},
-
-          {"matrix": [3, 14], "x": 15.5, "y": 3},
-          {"matrix": [3, 15], "x": 16.5, "y": 3},
-          {"matrix": [3, 16], "x": 17.5, "y": 3},
-          {"matrix": [3, 17], "x": 18.5, "y": 3},
-
-          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
-          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
-          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
-          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
-          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
-          {"matrix": [4, 15], "x": 16.5, "y": 4},
-          {"matrix": [4, 16], "x": 17.5, "y": 4},
-          {"matrix": [4, 17], "x": 18.5, "y": 4}
-        ]
-      }
-    }
-  }
diff --git a/keyboards/yiancardesigns/barleycorn/keyboard.json b/keyboards/yiancardesigns/barleycorn/keyboard.json
new file mode 100644
index 00000000000..2fd79052c91
--- /dev/null
+++ b/keyboards/yiancardesigns/barleycorn/keyboard.json
@@ -0,0 +1,316 @@
+{
+    "keyboard_name": "Barleycorn",
+    "manufacturer": "Yiancar-Designs",
+    "maintainer": "Yiancar",
+    "usb": {
+      "vid": "0x8968",
+      "pid": "0x4749",
+      "device_version": "0.0.1",
+      "max_power": 100
+    },
+    "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "mousekey": true
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "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": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.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},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.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},
+          {"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.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
+        ]
+      },
+      "LAYOUT_ansi": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "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": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.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},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+          {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
+        ]
+      },
+      "LAYOUT_iso": {
+        "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+          {"matrix": [0, 1], "x": 1, "y": 0},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0},
+          {"matrix": [0, 4], "x": 4, "y": 0},
+          {"matrix": [0, 5], "x": 5, "y": 0},
+          {"matrix": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [0, 14], "x": 15.5, "y": 0},
+          {"matrix": [0, 15], "x": 16.5, "y": 0},
+          {"matrix": [0, 16], "x": 17.5, "y": 0},
+          {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+          {"matrix": [1, 14], "x": 15.5, "y": 1},
+          {"matrix": [1, 15], "x": 16.5, "y": 1},
+          {"matrix": [1, 16], "x": 17.5, "y": 1},
+          {"matrix": [1, 17], "x": 18.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},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 12], "x": 12.75, "y": 2},
+          {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+          {"matrix": [2, 14], "x": 15.5, "y": 2},
+          {"matrix": [2, 15], "x": 16.5, "y": 2},
+          {"matrix": [2, 16], "x": 17.5, "y": 2},
+          {"matrix": [2, 17], "x": 18.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},
+          {"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.25, "y": 3.25},
+
+          {"matrix": [3, 14], "x": 15.5, "y": 3},
+          {"matrix": [3, 15], "x": 16.5, "y": 3},
+          {"matrix": [3, 16], "x": 17.5, "y": 3},
+          {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+          {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+          {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+          {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+          {"matrix": [4, 15], "x": 16.5, "y": 4},
+          {"matrix": [4, 16], "x": 17.5, "y": 4},
+          {"matrix": [4, 17], "x": 18.5, "y": 4}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/yiancardesigns/barleycorn/matrix.c b/keyboards/yiancardesigns/barleycorn/matrix.c
index 9ef29265662..008f096266d 100644
--- a/keyboards/yiancardesigns/barleycorn/matrix.c
+++ b/keyboards/yiancardesigns/barleycorn/matrix.c
@@ -14,10 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include "wait.h"
-#include "quantum.h"
 #include "i2c_master.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/yiancardesigns/barleycorn/rules.mk b/keyboards/yiancardesigns/barleycorn/rules.mk
index 3808b0d3f24..c04c3c92ed3 100644
--- a/keyboards/yiancardesigns/barleycorn/rules.mk
+++ b/keyboards/yiancardesigns/barleycorn/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json
deleted file mode 100644
index 23f0788d0f2..00000000000
--- a/keyboards/yiancardesigns/gingham/info.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-    "keyboard_name": "Gingham",
-    "manufacturer": "Yiancar-Designs",
-    "url": "https://yiancar-designs.com/product/gingham/",
-    "maintainer": "Yiancar",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4748",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "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": [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": 2.25},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 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}
-            ]
-        },
-        "LAYOUT_60_iso_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": [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, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yiancardesigns/gingham/keyboard.json b/keyboards/yiancardesigns/gingham/keyboard.json
new file mode 100644
index 00000000000..eb5573a355b
--- /dev/null
+++ b/keyboards/yiancardesigns/gingham/keyboard.json
@@ -0,0 +1,164 @@
+{
+    "keyboard_name": "Gingham",
+    "manufacturer": "Yiancar-Designs",
+    "url": "https://yiancar-designs.com/product/gingham/",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4748",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "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": [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": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 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}
+            ]
+        },
+        "LAYOUT_60_iso_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": [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, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [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, 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, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yiancardesigns/gingham/matrix.c b/keyboards/yiancardesigns/gingham/matrix.c
index d17518b4940..4e6319b52bc 100644
--- a/keyboards/yiancardesigns/gingham/matrix.c
+++ b/keyboards/yiancardesigns/gingham/matrix.c
@@ -14,10 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include "wait.h"
-#include "quantum.h"
 #include "i2c_master.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/yiancardesigns/gingham/rules.mk b/keyboards/yiancardesigns/gingham/rules.mk
index cd47b89aeda..23e7186f190 100644
--- a/keyboards/yiancardesigns/gingham/rules.mk
+++ b/keyboards/yiancardesigns/gingham/rules.mk
@@ -1,17 +1,4 @@
+CUSTOM_MATRIX = lite
+
 SRC = matrix.c
 I2C_DRIVER_REQUIRED = yes
-
-# 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
-
-CUSTOM_MATRIX = lite
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
deleted file mode 100644
index 91a0529e88a..00000000000
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ /dev/null
@@ -1,340 +0,0 @@
-{
-    "keyboard_name": "Seigaiha",
-    "manufacturer": "Yiancar-Designs",
-    "url": "www.yiancar-designs.com",
-    "maintainer": "Yiancar-Designs",
-    "usb": {
-        "vid": "0x8968",
-        "pid": "0x4750",
-        "device_version": "0.0.1",
-        "max_power": 100
-    },
-    "bootmagic": {
-        "matrix": [1, 0]
-    },
-    "processor": "atmega328p",
-    "bootloader": "usbasploader",
-    "community_layouts": ["alice", "alice_split_bs"],
-    "layouts": {
-        "LAYOUT_alice": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_rshift": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_rshift_split_bs": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_alice_split_bs": {
-            "layout": [
-                {"matrix": [1, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
-
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [0, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-
-                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 2], "x": 2.75, "y": 1},
-                {"matrix": [1, 3], "x": 3.75, "y": 1},
-                {"matrix": [1, 4], "x": 4.75, "y": 1},
-                {"matrix": [1, 5], "x": 5.75, "y": 1},
-                {"matrix": [1, 6], "x": 6.75, "y": 1},
-
-                {"matrix": [1, 7], "x": 9.75, "y": 1},
-                {"matrix": [1, 8], "x": 10.75, "y": 1},
-                {"matrix": [1, 9], "x": 11.75, "y": 1},
-                {"matrix": [1, 10], "x": 12.75, "y": 1},
-                {"matrix": [1, 11], "x": 13.75, "y": 1},
-                {"matrix": [1, 12], "x": 14.75, "y": 1},
-                {"matrix": [1, 13], "x": 15.75, "y": 1},
-                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 0], "x": 0, "y": 2},
-
-                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 3, "y": 2},
-                {"matrix": [2, 3], "x": 4, "y": 2},
-                {"matrix": [2, 4], "x": 5, "y": 2},
-                {"matrix": [2, 5], "x": 6, "y": 2},
-                {"matrix": [2, 6], "x": 7, "y": 2},
-
-                {"matrix": [2, 7], "x": 10, "y": 2},
-                {"matrix": [2, 8], "x": 11, "y": 2},
-                {"matrix": [2, 9], "x": 12, "y": 2},
-                {"matrix": [2, 10], "x": 13, "y": 2},
-                {"matrix": [2, 11], "x": 14, "y": 2},
-                {"matrix": [2, 12], "x": 15, "y": 2},
-                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 2], "x": 3.5, "y": 3},
-                {"matrix": [3, 3], "x": 4.5, "y": 3},
-                {"matrix": [3, 4], "x": 5.5, "y": 3},
-                {"matrix": [3, 5], "x": 6.5, "y": 3},
-                {"matrix": [3, 6], "x": 7.5, "y": 3},
-
-                {"matrix": [3, 7], "x": 9.5, "y": 3},
-                {"matrix": [3, 8], "x": 10.5, "y": 3},
-                {"matrix": [3, 9], "x": 11.5, "y": 3},
-                {"matrix": [3, 10], "x": 12.5, "y": 3},
-                {"matrix": [3, 11], "x": 13.5, "y": 3},
-                {"matrix": [3, 12], "x": 14.5, "y": 3},
-                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 14], "x": 17.25, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
-                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
-                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yiancardesigns/seigaiha/keyboard.json b/keyboards/yiancardesigns/seigaiha/keyboard.json
new file mode 100644
index 00000000000..5890357c99f
--- /dev/null
+++ b/keyboards/yiancardesigns/seigaiha/keyboard.json
@@ -0,0 +1,345 @@
+{
+    "keyboard_name": "Seigaiha",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4750",
+        "device_version": "0.0.1",
+        "max_power": 100
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "community_layouts": ["alice", "alice_split_bs"],
+    "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_rshift_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yiancardesigns/seigaiha/matrix.c b/keyboards/yiancardesigns/seigaiha/matrix.c
index 55ee239db4c..dc80c4becf9 100644
--- a/keyboards/yiancardesigns/seigaiha/matrix.c
+++ b/keyboards/yiancardesigns/seigaiha/matrix.c
@@ -14,10 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include "wait.h"
-#include "quantum.h"
 #include "i2c_master.h"
 
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
diff --git a/keyboards/yiancardesigns/seigaiha/rules.mk b/keyboards/yiancardesigns/seigaiha/rules.mk
index 3808b0d3f24..c04c3c92ed3 100644
--- a/keyboards/yiancardesigns/seigaiha/rules.mk
+++ b/keyboards/yiancardesigns/seigaiha/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 CUSTOM_MATRIX = lite
 
 SRC += matrix.c
diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/keyboard.json
similarity index 100%
rename from keyboards/ymdk/id75/info.json
rename to keyboards/ymdk/id75/keyboard.json
diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk
index edbd3dd7181..dbee20ab053 100644
--- a/keyboards/ymdk/id75/rules.mk
+++ b/keyboards/ymdk/id75/rules.mk
@@ -3,4 +3,3 @@ MCU_LDSCRIPT = STM32F103xB
 
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
diff --git a/keyboards/ymdk/melody96/soldered/info.json b/keyboards/ymdk/melody96/soldered/info.json
deleted file mode 100644
index f941c659702..00000000000
--- a/keyboards/ymdk/melody96/soldered/info.json
+++ /dev/null
@@ -1,1039 +0,0 @@
-{
-    "keyboard_name": "Melody96 Soldered",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x594D",
-        "pid": "0x4D96",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
-        "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
-    },
-    "diode_direction": "ROW2COL",
-    "backlight": {
-        "pin": "B6",
-        "levels": 5
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 18,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "indicators": {
-        "caps_lock": "C7",
-        "num_lock": "C6",
-        "scroll_lock": "B5",
-        "on_state": 0
-    },
-    "bootmagic": {
-        "matrix": [5, 0]
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_all"
-    },
-    "community_layouts": ["96_ansi", "96_iso"],
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 3], "x": 13, "y": 1},
-                {"matrix": [10, 6], "x": 14, "y": 1},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [9, 0], "x": 18, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-                {"matrix": [8, 0], "x": 18, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 4},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [7, 0], "x": 18, "y": 4},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5},
-                {"matrix": [6, 0], "x": 18, "y": 5}
-            ]
-        },
-        "LAYOUT_96_ansi": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_ansi_splitbs": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 3], "x": 13, "y": 1},
-                {"matrix": [10, 6], "x": 14, "y": 1},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_iso": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3},
-                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 4},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_iso_splitbs": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 3], "x": 13, "y": 1},
-                {"matrix": [10, 6], "x": 14, "y": 1},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3},
-                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 4},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_with60": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
-                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
-                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_with60_splitbs": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 3], "x": 13, "y": 1},
-                {"matrix": [10, 6], "x": 14, "y": 1},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
-                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
-                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_96_with60_split_num0": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
-                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        },
-        "LAYOUT_hotswap": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [5, 6], "x": 6, "y": 0},
-                {"matrix": [5, 7], "x": 7, "y": 0},
-                {"matrix": [5, 8], "x": 8, "y": 0},
-                {"matrix": [11, 8], "x": 9, "y": 0},
-                {"matrix": [11, 7], "x": 10, "y": 0},
-                {"matrix": [11, 5], "x": 11, "y": 0},
-                {"matrix": [11, 4], "x": 12, "y": 0},
-                {"matrix": [11, 3], "x": 13, "y": 0},
-                {"matrix": [11, 6], "x": 14, "y": 0},
-                {"matrix": [11, 2], "x": 15, "y": 0},
-                {"matrix": [11, 1], "x": 16, "y": 0},
-                {"matrix": [11, 0], "x": 17, "y": 0},
-                {"matrix": [6, 3], "x": 18, "y": 0},
-
-                {"matrix": [4, 0], "x": 0, "y": 1},
-                {"matrix": [4, 1], "x": 1, "y": 1},
-                {"matrix": [4, 2], "x": 2, "y": 1},
-                {"matrix": [4, 3], "x": 3, "y": 1},
-                {"matrix": [4, 4], "x": 4, "y": 1},
-                {"matrix": [4, 5], "x": 5, "y": 1},
-                {"matrix": [4, 6], "x": 6, "y": 1},
-                {"matrix": [4, 7], "x": 7, "y": 1},
-                {"matrix": [4, 8], "x": 8, "y": 1},
-                {"matrix": [10, 8], "x": 9, "y": 1},
-                {"matrix": [10, 7], "x": 10, "y": 1},
-                {"matrix": [10, 5], "x": 11, "y": 1},
-                {"matrix": [10, 4], "x": 12, "y": 1},
-                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
-                {"matrix": [10, 2], "x": 15, "y": 1},
-                {"matrix": [10, 1], "x": 16, "y": 1},
-                {"matrix": [10, 0], "x": 17, "y": 1},
-                {"matrix": [6, 4], "x": 18, "y": 1},
-
-                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
-                {"matrix": [3, 1], "x": 1.5, "y": 2},
-                {"matrix": [3, 2], "x": 2.5, "y": 2},
-                {"matrix": [3, 3], "x": 3.5, "y": 2},
-                {"matrix": [3, 4], "x": 4.5, "y": 2},
-                {"matrix": [3, 5], "x": 5.5, "y": 2},
-                {"matrix": [3, 6], "x": 6.5, "y": 2},
-                {"matrix": [3, 7], "x": 7.5, "y": 2},
-                {"matrix": [3, 8], "x": 8.5, "y": 2},
-                {"matrix": [9, 8], "x": 9.5, "y": 2},
-                {"matrix": [9, 7], "x": 10.5, "y": 2},
-                {"matrix": [9, 5], "x": 11.5, "y": 2},
-                {"matrix": [9, 4], "x": 12.5, "y": 2},
-                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
-                {"matrix": [9, 6], "x": 15, "y": 2},
-                {"matrix": [9, 2], "x": 16, "y": 2},
-                {"matrix": [9, 1], "x": 17, "y": 2},
-                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 3},
-                {"matrix": [2, 2], "x": 2.75, "y": 3},
-                {"matrix": [2, 3], "x": 3.75, "y": 3},
-                {"matrix": [2, 4], "x": 4.75, "y": 3},
-                {"matrix": [2, 5], "x": 5.75, "y": 3},
-                {"matrix": [2, 6], "x": 6.75, "y": 3},
-                {"matrix": [2, 7], "x": 7.75, "y": 3},
-                {"matrix": [2, 8], "x": 8.75, "y": 3},
-                {"matrix": [8, 8], "x": 9.75, "y": 3},
-                {"matrix": [8, 7], "x": 10.75, "y": 3},
-                {"matrix": [8, 5], "x": 11.75, "y": 3},
-                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
-                {"matrix": [8, 6], "x": 15, "y": 3},
-                {"matrix": [8, 2], "x": 16, "y": 3},
-                {"matrix": [8, 1], "x": 17, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 4},
-                {"matrix": [1, 3], "x": 3.25, "y": 4},
-                {"matrix": [1, 4], "x": 4.25, "y": 4},
-                {"matrix": [1, 5], "x": 5.25, "y": 4},
-                {"matrix": [1, 6], "x": 6.25, "y": 4},
-                {"matrix": [1, 7], "x": 7.25, "y": 4},
-                {"matrix": [1, 8], "x": 8.25, "y": 4},
-                {"matrix": [7, 8], "x": 9.25, "y": 4},
-                {"matrix": [7, 7], "x": 10.25, "y": 4},
-                {"matrix": [7, 5], "x": 11.25, "y": 4},
-                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
-                {"matrix": [7, 3], "x": 14, "y": 4},
-                {"matrix": [7, 6], "x": 15, "y": 4},
-                {"matrix": [7, 2], "x": 16, "y": 4},
-                {"matrix": [7, 1], "x": 17, "y": 4},
-                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
-
-                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
-                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
-                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
-                {"matrix": [0, 8], "x": 10, "y": 5},
-                {"matrix": [0, 7], "x": 11, "y": 5},
-                {"matrix": [0, 5], "x": 12, "y": 5},
-                {"matrix": [0, 4], "x": 13, "y": 5},
-                {"matrix": [0, 3], "x": 14, "y": 5},
-                {"matrix": [6, 6], "x": 15, "y": 5},
-                {"matrix": [6, 2], "x": 16, "y": 5},
-                {"matrix": [6, 1], "x": 17, "y": 5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ymdk/melody96/soldered/keyboard.json b/keyboards/ymdk/melody96/soldered/keyboard.json
new file mode 100644
index 00000000000..06d39472406
--- /dev/null
+++ b/keyboards/ymdk/melody96/soldered/keyboard.json
@@ -0,0 +1,1047 @@
+{
+    "keyboard_name": "Melody96 Soldered",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4D96",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "ROW2COL",
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 18,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "num_lock": "C6",
+        "scroll_lock": "B5",
+        "on_state": 0
+    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
+    "community_layouts": ["96_ansi", "96_iso"],
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [9, 0], "x": 18, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+                {"matrix": [8, 0], "x": 18, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [7, 0], "x": 18, "y": 4},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5},
+                {"matrix": [6, 0], "x": 18, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_ansi_splitbs": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso_splitbs": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3},
+                {"matrix": [9, 3], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_with60": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_with60_splitbs": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 3], "x": 13, "y": 1},
+                {"matrix": [10, 6], "x": 14, "y": 1},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 2], "x": 15, "y": 5, "w": 2},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_with60_split_num0": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [0, 7], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 4], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 3], "x": 13.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_hotswap": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [5, 6], "x": 6, "y": 0},
+                {"matrix": [5, 7], "x": 7, "y": 0},
+                {"matrix": [5, 8], "x": 8, "y": 0},
+                {"matrix": [11, 8], "x": 9, "y": 0},
+                {"matrix": [11, 7], "x": 10, "y": 0},
+                {"matrix": [11, 5], "x": 11, "y": 0},
+                {"matrix": [11, 4], "x": 12, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 6], "x": 14, "y": 0},
+                {"matrix": [11, 2], "x": 15, "y": 0},
+                {"matrix": [11, 1], "x": 16, "y": 0},
+                {"matrix": [11, 0], "x": 17, "y": 0},
+                {"matrix": [6, 3], "x": 18, "y": 0},
+
+                {"matrix": [4, 0], "x": 0, "y": 1},
+                {"matrix": [4, 1], "x": 1, "y": 1},
+                {"matrix": [4, 2], "x": 2, "y": 1},
+                {"matrix": [4, 3], "x": 3, "y": 1},
+                {"matrix": [4, 4], "x": 4, "y": 1},
+                {"matrix": [4, 5], "x": 5, "y": 1},
+                {"matrix": [4, 6], "x": 6, "y": 1},
+                {"matrix": [4, 7], "x": 7, "y": 1},
+                {"matrix": [4, 8], "x": 8, "y": 1},
+                {"matrix": [10, 8], "x": 9, "y": 1},
+                {"matrix": [10, 7], "x": 10, "y": 1},
+                {"matrix": [10, 5], "x": 11, "y": 1},
+                {"matrix": [10, 4], "x": 12, "y": 1},
+                {"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [10, 2], "x": 15, "y": 1},
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 0], "x": 17, "y": 1},
+                {"matrix": [6, 4], "x": 18, "y": 1},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 2},
+                {"matrix": [3, 2], "x": 2.5, "y": 2},
+                {"matrix": [3, 3], "x": 3.5, "y": 2},
+                {"matrix": [3, 4], "x": 4.5, "y": 2},
+                {"matrix": [3, 5], "x": 5.5, "y": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 2},
+                {"matrix": [3, 7], "x": 7.5, "y": 2},
+                {"matrix": [3, 8], "x": 8.5, "y": 2},
+                {"matrix": [9, 8], "x": 9.5, "y": 2},
+                {"matrix": [9, 7], "x": 10.5, "y": 2},
+                {"matrix": [9, 5], "x": 11.5, "y": 2},
+                {"matrix": [9, 4], "x": 12.5, "y": 2},
+                {"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [9, 6], "x": 15, "y": 2},
+                {"matrix": [9, 2], "x": 16, "y": 2},
+                {"matrix": [9, 1], "x": 17, "y": 2},
+                {"matrix": [8, 0], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 3},
+                {"matrix": [2, 2], "x": 2.75, "y": 3},
+                {"matrix": [2, 3], "x": 3.75, "y": 3},
+                {"matrix": [2, 4], "x": 4.75, "y": 3},
+                {"matrix": [2, 5], "x": 5.75, "y": 3},
+                {"matrix": [2, 6], "x": 6.75, "y": 3},
+                {"matrix": [2, 7], "x": 7.75, "y": 3},
+                {"matrix": [2, 8], "x": 8.75, "y": 3},
+                {"matrix": [8, 8], "x": 9.75, "y": 3},
+                {"matrix": [8, 7], "x": 10.75, "y": 3},
+                {"matrix": [8, 5], "x": 11.75, "y": 3},
+                {"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [8, 6], "x": 15, "y": 3},
+                {"matrix": [8, 2], "x": 16, "y": 3},
+                {"matrix": [8, 1], "x": 17, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 4},
+                {"matrix": [1, 3], "x": 3.25, "y": 4},
+                {"matrix": [1, 4], "x": 4.25, "y": 4},
+                {"matrix": [1, 5], "x": 5.25, "y": 4},
+                {"matrix": [1, 6], "x": 6.25, "y": 4},
+                {"matrix": [1, 7], "x": 7.25, "y": 4},
+                {"matrix": [1, 8], "x": 8.25, "y": 4},
+                {"matrix": [7, 8], "x": 9.25, "y": 4},
+                {"matrix": [7, 7], "x": 10.25, "y": 4},
+                {"matrix": [7, 5], "x": 11.25, "y": 4},
+                {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [7, 3], "x": 14, "y": 4},
+                {"matrix": [7, 6], "x": 15, "y": 4},
+                {"matrix": [7, 2], "x": 16, "y": 4},
+                {"matrix": [7, 1], "x": 17, "y": 4},
+                {"matrix": [6, 0], "x": 18, "y": 4, "h": 2},
+
+                {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [0, 8], "x": 10, "y": 5},
+                {"matrix": [0, 7], "x": 11, "y": 5},
+                {"matrix": [0, 5], "x": 12, "y": 5},
+                {"matrix": [0, 4], "x": 13, "y": 5},
+                {"matrix": [0, 3], "x": 14, "y": 5},
+                {"matrix": [6, 6], "x": 15, "y": 5},
+                {"matrix": [6, 2], "x": 16, "y": 5},
+                {"matrix": [6, 1], "x": 17, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/melody96/soldered/rules.mk b/keyboards/ymdk/melody96/soldered/rules.mk
deleted file mode 100644
index 3d5cb57ad50..00000000000
--- a/keyboards/ymdk/melody96/soldered/rules.mk
+++ /dev/null
@@ -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 = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json
deleted file mode 100644
index a0091c8f3da..00000000000
--- a/keyboards/ymdk/sp64/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "keyboard_name": "SP64",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "walston",
-    "usb": {
-        "vid": "0x594D",
-        "pid": "0x5364",
-        "device_version": "2.0.0"
-    },
-    "indicators": {
-        "caps_lock": "D1",
-        "num_lock": "D0",
-        "scroll_lock": "D6"
-    },
-    "ws2812": {
-        "driver": "i2c"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "max_brightness": 250,
-        "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
-        }
-    },
-    "processor": "atmega32a",
-    "bootloader": "bootloadhid",
-   "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [5, 0], "x": 0, "y": 0},
-                {"matrix": [5, 1], "x": 1, "y": 0},
-                {"matrix": [5, 2], "x": 2, "y": 0},
-                {"matrix": [5, 3], "x": 3, "y": 0},
-                {"matrix": [5, 4], "x": 4, "y": 0},
-                {"matrix": [5, 5], "x": 5, "y": 0},
-                {"matrix": [1, 5], "x": 6, "y": 0},
-
-                {"matrix": [4, 7], "x": 8, "y": 0},
-                {"matrix": [4, 8], "x": 9, "y": 0},
-                {"matrix": [4, 9], "x": 10, "y": 0},
-                {"matrix": [4, 10], "x": 11, "y": 0},
-                {"matrix": [4, 11], "x": 12, "y": 0},
-                {"matrix": [4, 12], "x": 13, "y": 0},
-                {"matrix": [4, 13], "x": 14, "y": 0, "w": 2},
-
-                {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 1},
-                {"matrix": [4, 2], "x": 2.5, "y": 1},
-                {"matrix": [4, 3], "x": 3.5, "y": 1},
-                {"matrix": [4, 4], "x": 4.5, "y": 1},
-                {"matrix": [4, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [5, 7], "x": 7.5, "y": 1},
-                {"matrix": [3, 7], "x": 8.5, "y": 1},
-                {"matrix": [3, 8], "x": 9.5, "y": 1},
-                {"matrix": [3, 9], "x": 10.5, "y": 1},
-                {"matrix": [3, 10], "x": 11.5, "y": 1},
-                {"matrix": [3, 11], "x": 12.5, "y": 1},
-                {"matrix": [3, 12], "x": 13.5, "y": 1},
-                {"matrix": [3, 13], "x": 14.5, "y": 1, "w": 1.5},
-
-                {"matrix": [3, 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": [3, 3], "x": 3.75, "y": 2},
-                {"matrix": [3, 4], "x": 4.75, "y": 2},
-                {"matrix": [3, 5], "x": 5.75, "y": 2},
-
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25},
-
-                {"matrix": [2, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [2, 1], "x": 2, "y": 3},
-                {"matrix": [2, 2], "x": 3, "y": 3},
-                {"matrix": [2, 3], "x": 4, "y": 3},
-                {"matrix": [2, 4], "x": 5, "y": 3},
-                {"matrix": [2, 5], "x": 6, "y": 3},
-
-                {"matrix": [1, 7], "x": 8, "y": 3},
-                {"matrix": [1, 8], "x": 9, "y": 3},
-                {"matrix": [1, 9], "x": 10, "y": 3},
-                {"matrix": [1, 10], "x": 11, "y": 3},
-                {"matrix": [1, 11], "x": 12, "y": 3},
-                {"matrix": [1, 12], "x": 13, "y": 3},
-                {"matrix": [1, 13], "x": 14, "y": 3},
-                {"matrix": [0, 13], "x": 15, "y": 3},
-
-                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 4},
-                {"matrix": [1, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [1, 3], "x": 3.5, "y": 4, "w": 2.25},
-                {"matrix": [1, 4], "x": 5.75, "y": 4},
-
-                {"matrix": [0, 7], "x": 7.75, "y": 4, "w": 2.75},
-                {"matrix": [0, 8], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [0, 9], "x": 11.75, "y": 4, "w": 1.25},
-                {"matrix": [0, 10], "x": 13, "y": 4},
-                {"matrix": [0, 11], "x": 14, "y": 4},
-                {"matrix": [0, 12], "x": 15, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ymdk/sp64/keyboard.json b/keyboards/ymdk/sp64/keyboard.json
new file mode 100644
index 00000000000..bfb140873af
--- /dev/null
+++ b/keyboards/ymdk/sp64/keyboard.json
@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "SP64",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "walston",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x5364",
+        "device_version": "2.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D0",
+        "scroll_lock": "D6"
+    },
+    "ws2812": {
+        "driver": "i2c"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "max_brightness": 250,
+        "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
+        }
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid",
+   "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
+                {"matrix": [5, 4], "x": 4, "y": 0},
+                {"matrix": [5, 5], "x": 5, "y": 0},
+                {"matrix": [1, 5], "x": 6, "y": 0},
+
+                {"matrix": [4, 7], "x": 8, "y": 0},
+                {"matrix": [4, 8], "x": 9, "y": 0},
+                {"matrix": [4, 9], "x": 10, "y": 0},
+                {"matrix": [4, 10], "x": 11, "y": 0},
+                {"matrix": [4, 11], "x": 12, "y": 0},
+                {"matrix": [4, 12], "x": 13, "y": 0},
+                {"matrix": [4, 13], "x": 14, "y": 0, "w": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 1},
+                {"matrix": [4, 2], "x": 2.5, "y": 1},
+                {"matrix": [4, 3], "x": 3.5, "y": 1},
+                {"matrix": [4, 4], "x": 4.5, "y": 1},
+                {"matrix": [4, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [5, 7], "x": 7.5, "y": 1},
+                {"matrix": [3, 7], "x": 8.5, "y": 1},
+                {"matrix": [3, 8], "x": 9.5, "y": 1},
+                {"matrix": [3, 9], "x": 10.5, "y": 1},
+                {"matrix": [3, 10], "x": 11.5, "y": 1},
+                {"matrix": [3, 11], "x": 12.5, "y": 1},
+                {"matrix": [3, 12], "x": 13.5, "y": 1},
+                {"matrix": [3, 13], "x": 14.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 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": [3, 3], "x": 3.75, "y": 2},
+                {"matrix": [3, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [2, 1], "x": 2, "y": 3},
+                {"matrix": [2, 2], "x": 3, "y": 3},
+                {"matrix": [2, 3], "x": 4, "y": 3},
+                {"matrix": [2, 4], "x": 5, "y": 3},
+                {"matrix": [2, 5], "x": 6, "y": 3},
+
+                {"matrix": [1, 7], "x": 8, "y": 3},
+                {"matrix": [1, 8], "x": 9, "y": 3},
+                {"matrix": [1, 9], "x": 10, "y": 3},
+                {"matrix": [1, 10], "x": 11, "y": 3},
+                {"matrix": [1, 11], "x": 12, "y": 3},
+                {"matrix": [1, 12], "x": 13, "y": 3},
+                {"matrix": [1, 13], "x": 14, "y": 3},
+                {"matrix": [0, 13], "x": 15, "y": 3},
+
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 4},
+                {"matrix": [1, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 4, "w": 2.25},
+                {"matrix": [1, 4], "x": 5.75, "y": 4},
+
+                {"matrix": [0, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [0, 8], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [0, 10], "x": 13, "y": 4},
+                {"matrix": [0, 11], "x": 14, "y": 4},
+                {"matrix": [0, 12], "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk
index 56da806510d..9edee34f595 100644
--- a/keyboards/ymdk/sp64/rules.mk
+++ b/keyboards/ymdk/sp64/rules.mk
@@ -1,16 +1,5 @@
-# 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json
deleted file mode 100644
index 4e791c87c47..00000000000
--- a/keyboards/ymdk/ymd40/air40/info.json
+++ /dev/null
@@ -1,343 +0,0 @@
-{
-    "keyboard_name": "YMDK Air40",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x45D4",
-        "pid": "0x0911",
-        "device_version": "0.0.1"
-    },
-    "rgb_matrix": {
-        "animations":{
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "max_brightness": 130,
-        "sleep": true
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
-        "rows": ["D0", "B3", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "ws2812": {
-        "pin": "E2"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uR": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uL": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uC": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ymdk/ymd40/air40/keyboard.json b/keyboards/ymdk/ymd40/air40/keyboard.json
new file mode 100644
index 00000000000..aaca80156b1
--- /dev/null
+++ b/keyboards/ymdk/ymd40/air40/keyboard.json
@@ -0,0 +1,350 @@
+{
+    "keyboard_name": "YMDK Air40",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x45D4",
+        "pid": "0x0911",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations":{
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "max_brightness": 130,
+        "sleep": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D0", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "ws2812": {
+        "pin": "E2"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uR": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uL": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uC": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk
index f408492aa87..9f9c86d4bbf 100644
--- a/keyboards/ymdk/ymd40/air40/rules.mk
+++ b/keyboards/ymdk/ymd40/air40/rules.mk
@@ -1,18 +1,2 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no
 RGBLIGHT_SUPPORTED = no
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output
 AUDIO_SUPPORTED = no
-KEY_LOCK_ENABLE = no
-
-LAYOUTS = ortho_4x12
diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json
deleted file mode 100644
index 6686030166b..00000000000
--- a/keyboards/ymdk/ymd40/v2/info.json
+++ /dev/null
@@ -1,317 +0,0 @@
-{
-    "keyboard_name": "YMD40 v2",
-    "manufacturer": "YMDK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x594D",
-        "pid": "0x4440",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
-        "rows": ["D0", "B3", "B2", "B1"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "breathing": true
-    },
-    "ws2812": {
-        "pin": "E2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 8,
-        "max_brightness": 150,
-        "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
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uR": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uL": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        },
-        "LAYOUT_ortho_4x12_1x2uC": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ymdk/ymd40/v2/keyboard.json b/keyboards/ymdk/ymd40/v2/keyboard.json
new file mode 100644
index 00000000000..08f5f0a4e37
--- /dev/null
+++ b/keyboards/ymdk/ymd40/v2/keyboard.json
@@ -0,0 +1,324 @@
+{
+    "keyboard_name": "YMD40 v2",
+    "manufacturer": "YMDK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x594D",
+        "pid": "0x4440",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"],
+        "rows": ["D0", "B3", "B2", "B1"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "breathing": true
+    },
+    "ws2812": {
+        "pin": "E2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 8,
+        "max_brightness": 150,
+        "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
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uR": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uL": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uC": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk
index e0fdb5c802b..79487b2ec4b 100644
--- a/keyboards/ymdk/ymd40/v2/rules.mk
+++ b/keyboards/ymdk/ymd40/v2/rules.mk
@@ -1,16 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-KEY_LOCK_ENABLE = no
-
 AUDIO_SUPPORTED = no
diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json
deleted file mode 100644
index aa00e7e69e3..00000000000
--- a/keyboards/yoichiro/lunakey_mini/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "keyboard_name": "Lunakey Mini",
-    "manufacturer": "yoichiro",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x5954",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 12,
-        "sleep": true,
-        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
-        "split_count": [6, 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": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_split_3x6_4": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1.5},
-                {"matrix": [0, 1], "x": 1, "y": 1.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.5},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.5},
-
-                {"matrix": [4, 5], "x": 8.75, "y": 0.5},
-                {"matrix": [4, 4], "x": 9.75, "y": 0.25},
-                {"matrix": [4, 3], "x": 10.75, "y": 0},
-                {"matrix": [4, 2], "x": 11.75, "y": 0.5},
-                {"matrix": [4, 1], "x": 12.75, "y": 1.25},
-                {"matrix": [4, 0], "x": 13.75, "y": 1.5},
-
-                {"matrix": [1, 0], "x": 0, "y": 2.5},
-                {"matrix": [1, 1], "x": 1, "y": 2.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.5},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-
-                {"matrix": [5, 5], "x": 8.75, "y": 1.5},
-                {"matrix": [5, 4], "x": 9.75, "y": 1.25},
-                {"matrix": [5, 3], "x": 10.75, "y": 1},
-                {"matrix": [5, 2], "x": 11.75, "y": 1.5},
-                {"matrix": [5, 1], "x": 12.75, "y": 2.25},
-                {"matrix": [5, 0], "x": 13.75, "y": 2.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 3.5},
-                {"matrix": [2, 1], "x": 1, "y": 3.25},
-                {"matrix": [2, 2], "x": 2, "y": 2.5},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 2.5},
-
-                {"matrix": [6, 5], "x": 8.75, "y": 2.5},
-                {"matrix": [6, 4], "x": 9.75, "y": 2.25},
-                {"matrix": [6, 3], "x": 10.75, "y": 2},
-                {"matrix": [6, 2], "x": 11.75, "y": 2.5},
-                {"matrix": [6, 1], "x": 12.75, "y": 3.25},
-                {"matrix": [6, 0], "x": 13.75, "y": 3.5},
-
-                {"matrix": [3, 2], "x": 3, "y": 4},
-                {"matrix": [3, 3], "x": 4, "y": 3.75},
-                {"matrix": [3, 4], "x": 5, "y": 3.75},
-                {"matrix": [3, 5], "x": 6, "y": 4},
-
-                {"matrix": [7, 5], "x": 7.75, "y": 4},
-                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
-                {"matrix": [7, 3], "x": 9.75, "y": 3.75},
-                {"matrix": [7, 2], "x": 10.75, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yoichiro/lunakey_mini/keyboard.json b/keyboards/yoichiro/lunakey_mini/keyboard.json
new file mode 100644
index 00000000000..5fbf6c8fbc9
--- /dev/null
+++ b/keyboards/yoichiro/lunakey_mini/keyboard.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Lunakey Mini",
+    "manufacturer": "yoichiro",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x5954",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 12,
+        "sleep": true,
+        "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
+        "split_count": [6, 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": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_split_3x6_4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [4, 5], "x": 8.75, "y": 0.5},
+                {"matrix": [4, 4], "x": 9.75, "y": 0.25},
+                {"matrix": [4, 3], "x": 10.75, "y": 0},
+                {"matrix": [4, 2], "x": 11.75, "y": 0.5},
+                {"matrix": [4, 1], "x": 12.75, "y": 1.25},
+                {"matrix": [4, 0], "x": 13.75, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [5, 5], "x": 8.75, "y": 1.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 1.25},
+                {"matrix": [5, 3], "x": 10.75, "y": 1},
+                {"matrix": [5, 2], "x": 11.75, "y": 1.5},
+                {"matrix": [5, 1], "x": 12.75, "y": 2.25},
+                {"matrix": [5, 0], "x": 13.75, "y": 2.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [6, 5], "x": 8.75, "y": 2.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 2.25},
+                {"matrix": [6, 3], "x": 10.75, "y": 2},
+                {"matrix": [6, 2], "x": 11.75, "y": 2.5},
+                {"matrix": [6, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 0], "x": 13.75, "y": 3.5},
+
+                {"matrix": [3, 2], "x": 3, "y": 4},
+                {"matrix": [3, 3], "x": 4, "y": 3.75},
+                {"matrix": [3, 4], "x": 5, "y": 3.75},
+                {"matrix": [3, 5], "x": 6, "y": 4},
+
+                {"matrix": [7, 5], "x": 7.75, "y": 4},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.75},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.75},
+                {"matrix": [7, 2], "x": 10.75, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yoichiro/lunakey_mini/rules.mk b/keyboards/yoichiro/lunakey_mini/rules.mk
deleted file mode 100644
index 6188406cdee..00000000000
--- a/keyboards/yoichiro/lunakey_mini/rules.mk
+++ /dev/null
@@ -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
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Enable Split keyboard
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/keyboard.json
similarity index 100%
rename from keyboards/yoichiro/lunakey_pico/info.json
rename to keyboards/yoichiro/lunakey_pico/keyboard.json
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index f9cd9345685..5f48c1f426d 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,5 +1,5 @@
 
-#include "quantum.h"
+#include "action_layer.h"
 #include <stdio.h>
 
 #define L_BASE 0
diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c
index daa008d8499..3d74fb45e4e 100644
--- a/keyboards/yosino58/lib/rgb_state_reader.c
+++ b/keyboards/yosino58/lib/rgb_state_reader.c
@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include "quantum.h"
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json
deleted file mode 100644
index c0dc03831fa..00000000000
--- a/keyboards/yosino58/rev1/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "keyboard_name": "yosino58",
-    "manufacturer": "sakuranbo0046",
-    "url": "https://github.com/sakurachari/yosino58",
-    "maintainer": "sakuranbo0046",
-    "usb": {
-        "vid": "0x0F6A",
-        "pid": "0x01B8",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "D2"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 1},
-                {"matrix": [0, 1], "x": 1, "y": 1},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.5},
-
-                {"matrix": [5, 5], "x": 10.75, "y": 0.5},
-                {"matrix": [5, 4], "x": 11.75, "y": 0.25},
-                {"matrix": [5, 3], "x": 12.75, "y": 0},
-                {"matrix": [5, 2], "x": 13.75, "y": 0.25},
-                {"matrix": [5, 1], "x": 14.75, "y": 1},
-                {"matrix": [5, 0], "x": 15.75, "y": 1},
-
-                {"matrix": [1, 0], "x": 0, "y": 2},
-                {"matrix": [1, 1], "x": 1, "y": 2},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.25},
-                {"matrix": [1, 5], "x": 5, "y": 1.5},
-
-                {"matrix": [6, 5], "x": 10.75, "y": 1.5},
-                {"matrix": [6, 4], "x": 11.75, "y": 1.25},
-                {"matrix": [6, 3], "x": 12.75, "y": 1},
-                {"matrix": [6, 2], "x": 13.75, "y": 1.25},
-                {"matrix": [6, 1], "x": 14.75, "y": 2},
-                {"matrix": [6, 0], "x": 15.75, "y": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 3},
-                {"matrix": [2, 1], "x": 1, "y": 3},
-                {"matrix": [2, 2], "x": 2, "y": 2.25},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.25},
-                {"matrix": [2, 5], "x": 5, "y": 2.5},
-
-                {"matrix": [7, 5], "x": 10.75, "y": 2.5},
-                {"matrix": [7, 4], "x": 11.75, "y": 2.25},
-                {"matrix": [7, 3], "x": 12.75, "y": 2},
-                {"matrix": [7, 2], "x": 13.75, "y": 2.25},
-                {"matrix": [7, 1], "x": 14.75, "y": 3},
-                {"matrix": [7, 0], "x": 15.75, "y": 3},
-
-                {"matrix": [3, 0], "x": 0, "y": 4},
-                {"matrix": [3, 1], "x": 1, "y": 4},
-                {"matrix": [3, 2], "x": 2, "y": 3.25},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.25},
-                {"matrix": [3, 5], "x": 5, "y": 3.5},
-
-                {"matrix": [4, 4], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 7.5, "y": 4.25, "h": 2},
-
-                {"matrix": [9, 5], "x": 8.5, "y": 4.25, "h": 2},
-                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
-
-                {"matrix": [8, 5], "x": 10.75, "y": 3.5},
-                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
-                {"matrix": [8, 3], "x": 12.75, "y": 3},
-                {"matrix": [8, 2], "x": 13.75, "y": 3.25},
-                {"matrix": [8, 1], "x": 14.75, "y": 4},
-                {"matrix": [8, 0], "x": 15.75, "y": 4},
-
-                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
-                {"matrix": [4, 2], "x": 4.75, "y": 4.5},
-
-                {"matrix": [4, 3], "x": 6.5, "y": 5.25},
-
-                {"matrix": [9, 3], "x": 9.5, "y": 5.25},
-
-                {"matrix": [9, 2], "x": 11, "y": 4.5},
-                {"matrix": [9, 1], "x": 12, "y": 4.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/yosino58/rev1/keyboard.json b/keyboards/yosino58/rev1/keyboard.json
new file mode 100644
index 00000000000..2e50450a272
--- /dev/null
+++ b/keyboards/yosino58/rev1/keyboard.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "yosino58",
+    "manufacturer": "sakuranbo0046",
+    "url": "https://github.com/sakurachari/yosino58",
+    "maintainer": "sakuranbo0046",
+    "usb": {
+        "vid": "0x0F6A",
+        "pid": "0x01B8",
+        "device_version": "0.0.1"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2"
+    },
+    "rgblight": {
+        "led_count": 12
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+                {"matrix": [5, 5], "x": 10.75, "y": 0.5},
+                {"matrix": [5, 4], "x": 11.75, "y": 0.25},
+                {"matrix": [5, 3], "x": 12.75, "y": 0},
+                {"matrix": [5, 2], "x": 13.75, "y": 0.25},
+                {"matrix": [5, 1], "x": 14.75, "y": 1},
+                {"matrix": [5, 0], "x": 15.75, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+                {"matrix": [6, 5], "x": 10.75, "y": 1.5},
+                {"matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 12.75, "y": 1},
+                {"matrix": [6, 2], "x": 13.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 14.75, "y": 2},
+                {"matrix": [6, 0], "x": 15.75, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+                {"matrix": [7, 5], "x": 10.75, "y": 2.5},
+                {"matrix": [7, 4], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 2], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 14.75, "y": 3},
+                {"matrix": [7, 0], "x": 15.75, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+                {"matrix": [3, 5], "x": 5, "y": 3.5},
+
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25, "h": 2},
+
+                {"matrix": [9, 5], "x": 8.5, "y": 4.25, "h": 2},
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25},
+
+                {"matrix": [8, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 2], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 14.75, "y": 4},
+                {"matrix": [8, 0], "x": 15.75, "y": 4},
+
+                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.5},
+
+                {"matrix": [4, 3], "x": 6.5, "y": 5.25},
+
+                {"matrix": [9, 3], "x": 9.5, "y": 5.25},
+
+                {"matrix": [9, 2], "x": 11, "y": 4.5},
+                {"matrix": [9, 1], "x": 12, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk
deleted file mode 100644
index 2fcc81da0f6..00000000000
--- a/keyboards/yosino58/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 1f01ffde5f9..8084f1f7bd8 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -19,6 +19,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2",
         "encoder": {
             "right": {
diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
index aa146fa1d2d..f30c00650ce 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk
+++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-SPLIT_KEYBOARD = yes
 ENCODER_ENABLE = yes
 
 SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
index 1ffd4416744..08b7464cf95 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.c
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -15,6 +15,11 @@
  */
 
 #include "navpad_prefs.h"
+#include "quantum.h"
+#include "action.h"
+#include "action_layer.h"
+#include "rgblight.h"
+#include "led.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.h b/keyboards/yushakobo/navpad/navpad_prefs.h
index d9d2286e5be..6c73e1ed07d 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.h
+++ b/keyboards/yushakobo/navpad/navpad_prefs.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include "keycodes.h"
 
 enum custom_keycodes { 
   TAP_00 = QK_KB_0
diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
index d1b27cd94e2..134f48965d0 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
         KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
-        CG_NORM,LCG_SWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
+        CG_NORM,CG_LSWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
     )
 };
 
diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
index d1b27cd94e2..134f48965d0 100644
--- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         [_FN] = LAYOUT(
         KC_ESC, KC_LANG,KC_NO,  RGB_TOG,KC_MNXT,KC_VOLU,
         KC_CAPS,KC_NUM, KC_NO,  RGB_MOD,KC_MPRV,KC_VOLD,
-        CG_NORM,LCG_SWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
+        CG_NORM,CG_LSWP,EE_CLR, QK_BOOT,  TO(0),  KC_MUTE
     )
 };
 
diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h
index 25f2e1e0ae5..a498381cee5 100644
--- a/keyboards/yushakobo/quick17/quick17_prefs.h
+++ b/keyboards/yushakobo/quick17/quick17_prefs.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "color.h"
 
 enum layer_names {
     _CONTROL,
diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
index 34b410ce574..4998cce0291 100644
--- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
+++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc
@@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 #include "quick17_prefs.h"
+#include "quantum.h"
 
 #define LED_LAYOUT(\
     L00, L01, L02, L03, L04, L05, \
diff --git a/keyboards/yynmt/acperience12/rev1/keyboard.json b/keyboards/yynmt/acperience12/rev1/keyboard.json
index 5eea37a35df..deb02bd55d4 100644
--- a/keyboards/yynmt/acperience12/rev1/keyboard.json
+++ b/keyboards/yynmt/acperience12/rev1/keyboard.json
@@ -8,6 +8,11 @@
         "pid": "0xEA51",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "matrix_pins": {
diff --git a/keyboards/yynmt/acperience12/rules.mk b/keyboards/yynmt/acperience12/rules.mk
index 3a226546213..cfe8b8ac18f 100644
--- a/keyboards/yynmt/acperience12/rules.mk
+++ b/keyboards/yynmt/acperience12/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = yynmt/acperience12/rev1
diff --git a/keyboards/zigotica/z34/info.json b/keyboards/zigotica/z34/info.json
deleted file mode 100644
index e82a6dd304c..00000000000
--- a/keyboards/zigotica/z34/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "z34",
-    "manufacturer": "zigotica",
-    "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z34",
-    "maintainer": "@zigotica",
-    "usb": {
-        "vid": "0x7A74",
-        "pid": "0x0002",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "matrix_pins": {
-        "direct": [
-            ["C6", "F7", "F6", "F5", "F4"],
-            ["D7", "B6", "B2", "B3", "B1"],
-            ["E6", "D4", "D0", "D1", "D3"],
-            ["B4", "B5", null, null, null]
-        ]
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "matrix_pins": {
-            "right": {
-                "direct": [
-                    ["F4", "F5", "F6", "F7", "C6"],
-                    ["B1", "B3", "B2", "B6", "D7"],
-                    ["D3", "D1", "D0", "D4", "E6"],
-                    ["B5", "B4", null, null, null]
-                ]
-            }
-        }
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0.93, "matrix": [0, 0]},
-                {"x": 1, "y": 0.31, "matrix": [0, 1]},
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 3, "y": 0.28, "matrix": [0, 3]},
-                {"x": 4, "y": 0.42, "matrix": [0, 4]},
-
-                {"x": 7, "y": 0.42, "matrix": [4, 0]},
-                {"x": 8, "y": 0.28, "matrix": [4, 1]},
-                {"x": 9, "y": 0, "matrix": [4, 2]},
-                {"x": 10, "y": 0.31, "matrix": [4, 3]},
-                {"x": 11, "y": 0.93, "matrix": [4, 4]},
-
-                {"x": 0, "y": 1.93, "matrix": [1, 0]},
-                {"x": 1, "y": 1.31, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 3, "y": 1.28, "matrix": [1, 3]},
-                {"x": 4, "y": 1.42, "matrix": [1, 4]},
-
-                {"x": 7, "y": 1.42, "matrix": [5, 0]},
-                {"x": 8, "y": 1.28, "matrix": [5, 1]},
-                {"x": 9, "y": 1, "matrix": [5, 2]},
-                {"x": 10, "y": 1.31, "matrix": [5, 3]},
-                {"x": 11, "y": 1.93, "matrix": [5, 4]},
-
-                {"x": 0, "y": 2.93, "matrix": [2, 0]},
-                {"x": 1, "y": 2.31, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 3, "y": 2.28, "matrix": [2, 3]},
-                {"x": 4, "y": 2.42, "matrix": [2, 4]},
-
-                {"x": 7, "y": 2.42, "matrix": [6, 0]},
-                {"x": 8, "y": 2.28, "matrix": [6, 1]},
-                {"x": 9, "y": 2, "matrix": [6, 2]},
-                {"x": 10, "y": 2.31, "matrix": [6, 3]},
-                {"x": 11, "y": 2.93, "matrix": [6, 4]},
-
-                {"x": 3.5, "y": 3.5, "matrix": [3, 0]},
-                {"x": 4.5, "y": 4, "matrix": [3, 1]},
-
-                {"x": 6.5, "y": 4, "matrix": [7, 0]},
-                {"x": 7.5, "y": 3.5, "matrix": [7, 1]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/zigotica/z34/keyboard.json b/keyboards/zigotica/z34/keyboard.json
new file mode 100644
index 00000000000..5faa9b23b21
--- /dev/null
+++ b/keyboards/zigotica/z34/keyboard.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "z34",
+    "manufacturer": "zigotica",
+    "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z34",
+    "maintainer": "@zigotica",
+    "usb": {
+        "vid": "0x7A74",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "extrakey": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "F7", "F6", "F5", "F4"],
+            ["D7", "B6", "B2", "B3", "B1"],
+            ["E6", "D4", "D0", "D1", "D3"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "F5", "F6", "F7", "C6"],
+                    ["B1", "B3", "B2", "B6", "D7"],
+                    ["D3", "D1", "D0", "D4", "E6"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0.93, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+                {"x": 7, "y": 0.42, "matrix": [4, 0]},
+                {"x": 8, "y": 0.28, "matrix": [4, 1]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 3]},
+                {"x": 11, "y": 0.93, "matrix": [4, 4]},
+
+                {"x": 0, "y": 1.93, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+                {"x": 7, "y": 1.42, "matrix": [5, 0]},
+                {"x": 8, "y": 1.28, "matrix": [5, 1]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 3]},
+                {"x": 11, "y": 1.93, "matrix": [5, 4]},
+
+                {"x": 0, "y": 2.93, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+                {"x": 7, "y": 2.42, "matrix": [6, 0]},
+                {"x": 8, "y": 2.28, "matrix": [6, 1]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 3]},
+                {"x": 11, "y": 2.93, "matrix": [6, 4]},
+
+                {"x": 3.5, "y": 3.5, "matrix": [3, 0]},
+                {"x": 4.5, "y": 4, "matrix": [3, 1]},
+
+                {"x": 6.5, "y": 4, "matrix": [7, 0]},
+                {"x": 7.5, "y": 3.5, "matrix": [7, 1]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zigotica/z34/rules.mk b/keyboards/zigotica/z34/rules.mk
index 669d2bc02f2..68cfee02814 100644
--- a/keyboards/zigotica/z34/rules.mk
+++ b/keyboards/zigotica/z34/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-SPLIT_KEYBOARD = yes       # Split common
-LTO_ENABLE = yes           # Enables Link Time Optimization (LTO) which reduces the compiled size
-
 # There are no extra pins, so we make sure to disable OLED and Encoders
 OLED_SUPPORTED = no        # Enables the use of OLED displays
 ENCODER_SUPPORTED = no      # Enables the use of encoders
-
diff --git a/keyboards/ziptyze/lets_split_v3/info.json b/keyboards/ziptyze/lets_split_v3/keyboard.json
similarity index 100%
rename from keyboards/ziptyze/lets_split_v3/info.json
rename to keyboards/ziptyze/lets_split_v3/keyboard.json
diff --git a/keyboards/zlabkeeb/15pad/keyboard.json b/keyboards/zlabkeeb/15pad/keyboard.json
index 9733d0169a8..6e28d594f20 100644
--- a/keyboards/zlabkeeb/15pad/keyboard.json
+++ b/keyboards/zlabkeeb/15pad/keyboard.json
@@ -59,18 +59,18 @@
                 {"x": 0, "y": 0, "matrix": [0, 0], "encoder": 0},
                 {"x": 1, "y": 0, "matrix": [0, 1], "encoder": 1},
                 {"x": 3, "y": 0, "matrix": [0, 3], "encoder": 2},
-                {"x": 0, "y": 0, "matrix": [1, 0]},
-                {"x": 1, "y": 0, "matrix": [1, 1]},
-                {"x": 2, "y": 0, "matrix": [1, 2]},
-                {"x": 3, "y": 0, "matrix": [1, 3]},
-                {"x": 0, "y": 0, "matrix": [2, 0]},
-                {"x": 1, "y": 0, "matrix": [2, 1]},
-                {"x": 2, "y": 0, "matrix": [2, 2]},
-                {"x": 3, "y": 0, "matrix": [2, 3]},
-                {"x": 0, "y": 0, "matrix": [3, 0]},
-                {"x": 1, "y": 0, "matrix": [3, 1]},
-                {"x": 2, "y": 0, "matrix": [3, 2]},
-                {"x": 3, "y": 0, "matrix": [3, 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]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]}
             ]
         }
     }
diff --git a/keyboards/zlabkeeb/6pad/readme.md b/keyboards/zlabkeeb/6pad/readme.md
index 9470ee1d6d9..4575f69088f 100644
--- a/keyboards/zlabkeeb/6pad/readme.md
+++ b/keyboards/zlabkeeb/6pad/readme.md
@@ -7,7 +7,7 @@
 -   Support RGB light UnderGlow
 -   Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb)
 -   Hardware Supported: 6Pad PCB, Promicro
--   Hardware Availability: (INDONESIA Only) Will be available at [Tokopedia](https://www.tokopedia.com/zahranetid)
+-   Hardware Availability: (INDONESIA ONLY) [Tokopedia](https://www.tokopedia.com/zahranetid/macropad-6pad-via-compatible-by-zlabkeeb)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -24,3 +24,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 Enter the bootloader in 1 way:
 
 -   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+
diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json
deleted file mode 100644
index 7fba339db1c..00000000000
--- a/keyboards/zlant/info.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-    "keyboard_name": "Zlant",
-    "manufacturer": "Matthew Cordier",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"],
-        "rows": ["B0", "B1", "D4", "D5"]
-    },
-    "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": "D6"
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["ortho_4x12", "planck_mit"],
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_ortho_4x12"
-    },
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-                {"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": [2, 0], "x": 0.5, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3},
-                {"matrix": [3, 5], "x": 5.75, "y": 3},
-                {"matrix": [3, 6], "x": 6.75, "y": 3},
-                {"matrix": [3, 7], "x": 7.75, "y": 3},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        },
-        "LAYOUT_planck_mit": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1},
-                {"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": [2, 0], "x": 0.5, "y": 2},
-                {"matrix": [2, 1], "x": 1.5, "y": 2},
-                {"matrix": [2, 2], "x": 2.5, "y": 2},
-                {"matrix": [2, 3], "x": 3.5, "y": 2},
-                {"matrix": [2, 4], "x": 4.5, "y": 2},
-                {"matrix": [2, 5], "x": 5.5, "y": 2},
-                {"matrix": [2, 6], "x": 6.5, "y": 2},
-                {"matrix": [2, 7], "x": 7.5, "y": 2},
-                {"matrix": [2, 8], "x": 8.5, "y": 2},
-                {"matrix": [2, 9], "x": 9.5, "y": 2},
-                {"matrix": [2, 10], "x": 10.5, "y": 2},
-                {"matrix": [2, 11], "x": 11.5, "y": 2},
-
-                {"matrix": [3, 0], "x": 0.75, "y": 3},
-                {"matrix": [3, 1], "x": 1.75, "y": 3},
-                {"matrix": [3, 2], "x": 2.75, "y": 3},
-                {"matrix": [3, 3], "x": 3.75, "y": 3},
-                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
-                {"matrix": [3, 5], "x": 6, "y": 3, "w": 1.5},
-                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 1.25},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/zlant/keyboard.json b/keyboards/zlant/keyboard.json
new file mode 100644
index 00000000000..d59b1c3f19d
--- /dev/null
+++ b/keyboards/zlant/keyboard.json
@@ -0,0 +1,160 @@
+{
+    "keyboard_name": "Zlant",
+    "manufacturer": "Matthew Cordier",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"],
+        "rows": ["B0", "B1", "D4", "D5"]
+    },
+    "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": "D6"
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"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": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        },
+        "LAYOUT_planck_mit": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"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": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 1.5},
+                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk
index c0d021d8912..4df55cd2206 100755
--- a/keyboards/zlant/rules.mk
+++ b/keyboards/zlant/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = no	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/moonlander/info.json b/keyboards/zsa/moonlander/info.json
deleted file mode 100644
index 31d6693e398..00000000000
--- a/keyboards/zsa/moonlander/info.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-    "keyboard_name": "Moonlander Mark I",
-    "manufacturer": "ZSA Technology Labs",
-    "url": "zsa.io/moonlander",
-    "maintainer": "ZSA via Drashna",
-    "usb": {
-        "vid": "0x3297",
-        "pid": "0x1969",
-        "device_version": "0.0.1"
-    },
-    "dynamic_keymap": {
-        "layer_count": 8
-    },
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "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
-        },
-        "center_point": [120, 36],
-        "driver": "is31fl3731",
-        "max_brightness": 175,
-        "sleep": true
-    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
-    "layout_aliases": {
-        "LAYOUT_moonlander": "LAYOUT"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.375},
-                {"matrix": [0, 1], "x": 1, "y": 0.375},
-                {"matrix": [0, 2], "x": 2, "y": 0.125},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0.125},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.25},
-
-                {"matrix": [6, 0], "x": 10, "y": 0.25},
-                {"matrix": [6, 1], "x": 11, "y": 0.25},
-                {"matrix": [6, 2], "x": 12, "y": 0.125},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0.125},
-                {"matrix": [6, 5], "x": 15, "y": 0.375},
-                {"matrix": [6, 6], "x": 16, "y": 0.375},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.375},
-                {"matrix": [1, 1], "x": 1, "y": 1.375},
-                {"matrix": [1, 2], "x": 2, "y": 1.125},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1.125},
-                {"matrix": [1, 5], "x": 5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6, "y": 1.25},
-
-                {"matrix": [7, 0], "x": 10, "y": 1.25},
-                {"matrix": [7, 1], "x": 11, "y": 1.25},
-                {"matrix": [7, 2], "x": 12, "y": 1.125},
-                {"matrix": [7, 3], "x": 13, "y": 1},
-                {"matrix": [7, 4], "x": 14, "y": 1.125},
-                {"matrix": [7, 5], "x": 15, "y": 1.375},
-                {"matrix": [7, 6], "x": 16, "y": 1.375},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.375},
-                {"matrix": [2, 1], "x": 1, "y": 2.375},
-                {"matrix": [2, 2], "x": 2, "y": 2.125},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2.125},
-                {"matrix": [2, 5], "x": 5, "y": 2.25},
-                {"matrix": [2, 6], "x": 6, "y": 2.25},
-
-                {"matrix": [8, 0], "x": 10, "y": 2.25},
-                {"matrix": [8, 1], "x": 11, "y": 2.25},
-                {"matrix": [8, 2], "x": 12, "y": 2.125},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2.125},
-                {"matrix": [8, 5], "x": 15, "y": 2.375},
-                {"matrix": [8, 6], "x": 16, "y": 2.375},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.375},
-                {"matrix": [3, 1], "x": 1, "y": 3.375},
-                {"matrix": [3, 2], "x": 2, "y": 3.125},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3.125},
-                {"matrix": [3, 5], "x": 5, "y": 3.25},
-
-                {"matrix": [9, 1], "x": 11, "y": 3.25},
-                {"matrix": [9, 2], "x": 12, "y": 3.125},
-                {"matrix": [9, 3], "x": 13, "y": 3},
-                {"matrix": [9, 4], "x": 14, "y": 3.125},
-                {"matrix": [9, 5], "x": 15, "y": 3.375},
-                {"matrix": [9, 6], "x": 16, "y": 3.375},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.375},
-                {"matrix": [4, 1], "x": 1, "y": 4.375},
-                {"matrix": [4, 2], "x": 2, "y": 4.125},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4.125},
-                {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2},
-
-                {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2},
-                {"matrix": [10, 2], "x": 12, "y": 4.125},
-                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 4], "x": 14, "y": 4.125},
-                {"matrix": [10, 5], "x": 15, "y": 4.375},
-                {"matrix": [10, 6], "x": 16, "y": 4.375},
-
-                {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5},
-                {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5},
-                {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5},
-
-                {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5},
-                {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5},
-                {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/zsa/moonlander/keyboard.json b/keyboards/zsa/moonlander/keyboard.json
new file mode 100644
index 00000000000..233cb46bba7
--- /dev/null
+++ b/keyboards/zsa/moonlander/keyboard.json
@@ -0,0 +1,176 @@
+{
+    "keyboard_name": "Moonlander Mark I",
+    "manufacturer": "ZSA Technology Labs",
+    "url": "zsa.io/moonlander",
+    "maintainer": "ZSA via Drashna",
+    "usb": {
+        "vid": "0x3297",
+        "pid": "0x1969",
+        "device_version": "0.0.1",
+        "shared_endpoint": {
+            "mouse": false
+        }
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "swap_hands": true
+    },
+    "dynamic_keymap": {
+        "layer_count": 8
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "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
+        },
+        "center_point": [120, 36],
+        "driver": "is31fl3731",
+        "max_brightness": 175,
+        "sleep": true
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "layout_aliases": {
+        "LAYOUT_moonlander": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 0.25},
+                {"matrix": [6, 1], "x": 11, "y": 0.25},
+                {"matrix": [6, 2], "x": 12, "y": 0.125},
+                {"matrix": [6, 3], "x": 13, "y": 0},
+                {"matrix": [6, 4], "x": 14, "y": 0.125},
+                {"matrix": [6, 5], "x": 15, "y": 0.375},
+                {"matrix": [6, 6], "x": 16, "y": 0.375},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+                {"matrix": [7, 0], "x": 10, "y": 1.25},
+                {"matrix": [7, 1], "x": 11, "y": 1.25},
+                {"matrix": [7, 2], "x": 12, "y": 1.125},
+                {"matrix": [7, 3], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1.125},
+                {"matrix": [7, 5], "x": 15, "y": 1.375},
+                {"matrix": [7, 6], "x": 16, "y": 1.375},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6, "y": 2.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 2.25},
+                {"matrix": [8, 1], "x": 11, "y": 2.25},
+                {"matrix": [8, 2], "x": 12, "y": 2.125},
+                {"matrix": [8, 3], "x": 13, "y": 2},
+                {"matrix": [8, 4], "x": 14, "y": 2.125},
+                {"matrix": [8, 5], "x": 15, "y": 2.375},
+                {"matrix": [8, 6], "x": 16, "y": 2.375},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.375},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+                {"matrix": [9, 1], "x": 11, "y": 3.25},
+                {"matrix": [9, 2], "x": 12, "y": 3.125},
+                {"matrix": [9, 3], "x": 13, "y": 3},
+                {"matrix": [9, 4], "x": 14, "y": 3.125},
+                {"matrix": [9, 5], "x": 15, "y": 3.375},
+                {"matrix": [9, 6], "x": 16, "y": 3.375},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.375},
+                {"matrix": [4, 1], "x": 1, "y": 4.375},
+                {"matrix": [4, 2], "x": 2, "y": 4.125},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.125},
+                {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2},
+
+                {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2},
+                {"matrix": [10, 2], "x": 12, "y": 4.125},
+                {"matrix": [10, 3], "x": 13, "y": 4},
+                {"matrix": [10, 4], "x": 14, "y": 4.125},
+                {"matrix": [10, 5], "x": 15, "y": 4.375},
+                {"matrix": [10, 6], "x": 16, "y": 4.375},
+
+                {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5},
+                {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5},
+                {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5},
+
+                {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5},
+                {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk
index 204c5940e44..46375584890 100644
--- a/keyboards/zsa/moonlander/rules.mk
+++ b/keyboards/zsa/moonlander/rules.mk
@@ -1,22 +1,6 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = dac_additive
 CUSTOM_MATRIX = lite
-SWAP_HANDS_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
 
-#project specific files
+# project specific files
 SRC += matrix.c
 I2C_DRIVER_REQUIRED = yes
-
-MOUSE_SHARED_EP = no
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index dd26e9ca325..efc3bbe66a9 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -1,45 +1,10 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define SPLIT_HAND_PIN B3
 #define SELECT_SOFT_SERIAL_SPEED 0
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
 #define WS2812_PWM_DMA_CHANNEL 3
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/zvecr/split_blackpill/halconf.h b/keyboards/zvecr/split_blackpill/halconf.h
index 0ee73f028ad..894921e6d2b 100644
--- a/keyboards/zvecr/split_blackpill/halconf.h
+++ b/keyboards/zvecr/split_blackpill/halconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -26,4 +8,3 @@
 #define HAL_USE_SERIAL TRUE
 
 #include_next <halconf.h>
-
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
deleted file mode 100644
index 377ec44f97e..00000000000
--- a/keyboards/zvecr/split_blackpill/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "keyboard_name": "split_blackpill",
-    "manufacturer": "zvecr",
-    "url": "",
-    "maintainer": "zvecr",
-    "usb": {
-        "vid": "0x5A56",
-        "pid": "0x0001",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
-        "rows": ["B15", "B14", "B13", "B12"],
-        "io_delay": 5
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "soft_serial_pin": "B6",
-        "bootmagic": {
-            "matrix": [4, 0]
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["B12", "B13", "B14", "B15", "A8", "A9"],
-                "rows": ["B0", "B1", "B10", "B11"]
-            }
-        }
-    },
-    "rgblight": {
-        "led_count": 24,
-        "split_count": [12, 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": "B4",
-        "driver": "pwm"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [4, 5], "x": 6, "y": 0},
-                {"matrix": [4, 4], "x": 7, "y": 0},
-                {"matrix": [4, 3], "x": 8, "y": 0},
-                {"matrix": [4, 2], "x": 9, "y": 0},
-                {"matrix": [4, 1], "x": 10, "y": 0},
-                {"matrix": [4, 0], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [5, 5], "x": 6, "y": 1},
-                {"matrix": [5, 4], "x": 7, "y": 1},
-                {"matrix": [5, 3], "x": 8, "y": 1},
-                {"matrix": [5, 2], "x": 9, "y": 1},
-                {"matrix": [5, 1], "x": 10, "y": 1},
-                {"matrix": [5, 0], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [6, 5], "x": 6, "y": 2},
-                {"matrix": [6, 4], "x": 7, "y": 2},
-                {"matrix": [6, 3], "x": 8, "y": 2},
-                {"matrix": [6, 2], "x": 9, "y": 2},
-                {"matrix": [6, 1], "x": 10, "y": 2},
-                {"matrix": [6, 0], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [7, 5], "x": 6, "y": 3},
-                {"matrix": [7, 4], "x": 7, "y": 3},
-                {"matrix": [7, 3], "x": 8, "y": 3},
-                {"matrix": [7, 2], "x": 9, "y": 3},
-                {"matrix": [7, 1], "x": 10, "y": 3},
-                {"matrix": [7, 0], "x": 11, "y": 3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/zvecr/split_blackpill/keyboard.json b/keyboards/zvecr/split_blackpill/keyboard.json
new file mode 100644
index 00000000000..71eb99b7d40
--- /dev/null
+++ b/keyboards/zvecr/split_blackpill/keyboard.json
@@ -0,0 +1,120 @@
+{
+    "keyboard_name": "split_blackpill",
+    "manufacturer": "zvecr",
+    "url": "",
+    "maintainer": "zvecr",
+    "usb": {
+        "vid": "0x5A56",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
+        "rows": ["B15", "B14", "B13", "B12"],
+        "io_delay": 5
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "B3"
+        },
+        "soft_serial_pin": "B6",
+        "bootmagic": {
+            "matrix": [4, 0]
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["B12", "B13", "B14", "B15", "A8", "A9"],
+                "rows": ["B0", "B1", "B10", "B11"]
+            }
+        }
+    },
+    "rgblight": {
+        "led_count": 24,
+        "split_count": [12, 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": "B4",
+        "driver": "pwm"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 5], "x": 6, "y": 0},
+                {"matrix": [4, 4], "x": 7, "y": 0},
+                {"matrix": [4, 3], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 0], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [5, 5], "x": 6, "y": 1},
+                {"matrix": [5, 4], "x": 7, "y": 1},
+                {"matrix": [5, 3], "x": 8, "y": 1},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 0], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 5], "x": 6, "y": 2},
+                {"matrix": [6, 4], "x": 7, "y": 2},
+                {"matrix": [6, 3], "x": 8, "y": 2},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 0], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [7, 5], "x": 6, "y": 3},
+                {"matrix": [7, 4], "x": 7, "y": 3},
+                {"matrix": [7, 3], "x": 8, "y": 3},
+                {"matrix": [7, 2], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 0], "x": 11, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c
index 51052bd6c3f..e48a7950289 100644
--- a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c
+++ b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c
@@ -1,6 +1,8 @@
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
-// Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _QWERTY,
     _LOWER,
@@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
     KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
@@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-    _______, QK_BOOT,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT,   _______,
+    _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/zvecr/split_blackpill/mcuconf.h b/keyboards/zvecr/split_blackpill/mcuconf.h
index 01cb4f40f42..72b7a95be8b 100644
--- a/keyboards/zvecr/split_blackpill/mcuconf.h
+++ b/keyboards/zvecr/split_blackpill/mcuconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -31,4 +13,3 @@
 
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 FALSE
-
diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk
index 196b4019ca5..c6e29883213 100644
--- a/keyboards/zvecr/split_blackpill/rules.mk
+++ b/keyboards/zvecr/split_blackpill/rules.mk
@@ -1,19 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart
-
-# Disable unsupported hardware
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.c b/keyboards/zvecr/split_blackpill/split_blackpill.c
index 6c7db0580e7..64f1cb84013 100644
--- a/keyboards/zvecr/split_blackpill/split_blackpill.c
+++ b/keyboards/zvecr/split_blackpill/split_blackpill.c
@@ -1,25 +1,13 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "quantum.h"
 
-void keyboard_pre_init_kb(void){
+void keyboard_pre_init_kb(void) {
     // Workaround for reversible pcb/mcu
-    palSetLineMode(C13, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(B9, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(B8, PAL_MODE_OUTPUT_OPENDRAIN);
+    gpio_set_pin_output_open_drain(C13);
+    gpio_set_pin_output_open_drain(B9);
+    gpio_set_pin_output_open_drain(B8);
 
     keyboard_pre_init_user();
 }
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index a67a46a1850..9e8c2656a91 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -1,21 +1,8 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
-#define SPLIT_HAND_PIN B9
 //#define SELECT_SOFT_SERIAL_SPEED 0
 #define SERIAL_USART_SPEED 921600
 
@@ -24,24 +11,3 @@
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_PWM_DMA_CHANNEL 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/zvecr/zv48/f401/halconf.h b/keyboards/zvecr/zv48/f401/halconf.h
index b42a6939968..089526f1f0d 100644
--- a/keyboards/zvecr/zv48/f401/halconf.h
+++ b/keyboards/zvecr/zv48/f401/halconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -28,4 +10,3 @@
 #define SERIAL_USB_BUFFERS_SIZE 256
 
 #include_next <halconf.h>
-
diff --git a/keyboards/zvecr/zv48/f401/keyboard.json b/keyboards/zvecr/zv48/f401/keyboard.json
index acd7e83f77d..797e9900595 100644
--- a/keyboards/zvecr/zv48/f401/keyboard.json
+++ b/keyboards/zvecr/zv48/f401/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F401",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F401"
+    "development_board": "blackpill_f401"
 }
diff --git a/keyboards/zvecr/zv48/f401/mcuconf.h b/keyboards/zvecr/zv48/f401/mcuconf.h
index 3c14f5e0275..6a6ab823771 100644
--- a/keyboards/zvecr/zv48/f401/mcuconf.h
+++ b/keyboards/zvecr/zv48/f401/mcuconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -28,4 +10,3 @@
 
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
-
diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk
new file mode 100644
index 00000000000..c6e29883213
--- /dev/null
+++ b/keyboards/zvecr/zv48/f401/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
diff --git a/keyboards/zvecr/zv48/f411/halconf.h b/keyboards/zvecr/zv48/f411/halconf.h
index 3678cd52b51..089526f1f0d 100644
--- a/keyboards/zvecr/zv48/f411/halconf.h
+++ b/keyboards/zvecr/zv48/f411/halconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -28,4 +10,3 @@
 #define SERIAL_USB_BUFFERS_SIZE 256
 
 #include_next <halconf.h>
-
diff --git a/keyboards/zvecr/zv48/f411/keyboard.json b/keyboards/zvecr/zv48/f411/keyboard.json
index 2517a82403f..a41c5f4dd14 100644
--- a/keyboards/zvecr/zv48/f411/keyboard.json
+++ b/keyboards/zvecr/zv48/f411/keyboard.json
@@ -1,5 +1,3 @@
 {
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
diff --git a/keyboards/zvecr/zv48/f411/mcuconf.h b/keyboards/zvecr/zv48/f411/mcuconf.h
index 572a8616cfb..6a6ab823771 100644
--- a/keyboards/zvecr/zv48/f411/mcuconf.h
+++ b/keyboards/zvecr/zv48/f411/mcuconf.h
@@ -1,23 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h`
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -28,4 +10,3 @@
 
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
-
diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk
new file mode 100644
index 00000000000..c6e29883213
--- /dev/null
+++ b/keyboards/zvecr/zv48/f411/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index e58651499a9..e596eb6e79b 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0048",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
     "matrix_pins": {
         "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
         "rows": ["A10", "A15", "B3", "B4"],
@@ -41,6 +49,10 @@
         }
     },
     "split": {
+        "enabled": true,
+        "handedness": {
+            "pin": "B9"
+        },
         "soft_serial_pin": "B6",
         "bootmagic": {
             "matrix": [4, 0]
@@ -56,7 +68,7 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0, "encoder": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
                 {"matrix": [0, 3], "x": 3, "y": 0},
@@ -67,7 +79,7 @@
                 {"matrix": [4, 3], "x": 8, "y": 0},
                 {"matrix": [4, 2], "x": 9, "y": 0},
                 {"matrix": [4, 1], "x": 10, "y": 0},
-                {"matrix": [4, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 11, "y": 0, "encoder": 1},
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},
diff --git a/keyboards/zvecr/zv48/keymaps/default/keymap.c b/keyboards/zvecr/zv48/keymaps/default/keymap.c
index 51052bd6c3f..e48a7950289 100644
--- a/keyboards/zvecr/zv48/keymaps/default/keymap.c
+++ b/keyboards/zvecr/zv48/keymaps/default/keymap.c
@@ -1,6 +1,8 @@
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
-// Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _QWERTY,
     _LOWER,
@@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_4x12(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
     KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
@@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] =  LAYOUT_ortho_4x12(
-    _______, QK_BOOT,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT,   _______,
+    _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk
deleted file mode 100644
index 7b615f95fa4..00000000000
--- a/keyboards/zvecr/zv48/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
-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
-ENCODER_ENABLE = yes        # Enable rotary encoder support
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-SERIAL_DRIVER = usart
-
-DEFAULT_FOLDER = zvecr/zv48/f401
diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c
index 2716b780806..91cf2d25209 100644
--- a/keyboards/zvecr/zv48/zv48.c
+++ b/keyboards/zvecr/zv48/zv48.c
@@ -1,27 +1,15 @@
-/* Copyright 2020 zvecr <git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2024 zvecr <git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "quantum.h"
 
-void keyboard_pre_init_kb(void){
+void keyboard_pre_init_kb(void) {
     // Workaround for reversible pcb/mcu
-    palSetLineMode(C13, PAL_MODE_INPUT_PULLUP);
-    palSetLineMode(C15, PAL_MODE_INPUT_PULLUP);
-    palSetLineMode(B7, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(A0, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(A1, PAL_MODE_OUTPUT_OPENDRAIN);
+    gpio_set_pin_input_high(C13);
+    gpio_set_pin_input_high(C15);
+    gpio_set_pin_output_open_drain(B7);
+    gpio_set_pin_output_open_drain(A0);
+    gpio_set_pin_output_open_drain(A1);
 
     keyboard_pre_init_user();
 }
diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
index b07d56ea206..228522f1b67 100644
--- a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
+++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c
@@ -11,9 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│
      * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
-     * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│
+     * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
      * │Ctrl │   │ Alt │                           │ Alt │   │ Ctrl│
      * └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
      */
diff --git a/layouts/default/ortho_5x10/info.json b/layouts/default/ortho_5x10/info.json
index 0c4cb9bb498..cf02fd618ae 100644
--- a/layouts/default/ortho_5x10/info.json
+++ b/layouts/default/ortho_5x10/info.json
@@ -58,7 +58,7 @@
                 {"x":6, "y":4},
                 {"x":7, "y":4},
                 {"x":8, "y":4},
-                {"x":9, "y":4},
+                {"x":9, "y":4}
             ]
         }
     }
diff --git a/lib/chibios b/lib/chibios
index 11edb161098..be44b3305f9 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51
+Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 9d7a7f904ed..77cb0a4f758 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b
+Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index 4c36dec3e79..8d1195bc8f0 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -41,17 +41,17 @@ def compile(cli):
         cli.args.filter = []
         cli.config.mass_compile.keymap = cli.config.compile.keymap
         cli.config.mass_compile.parallel = cli.config.compile.parallel
-        cli.config.mass_compile.no_temp = False
+        cli.args.no_temp = False
         return mass_compile(cli)
 
     # If we've received `-km all`, reroute it to mass-compile.
     if cli.args.keymap == 'all':
         from .mass_compile import mass_compile
-        cli.args.builds = [f'{cli.args.keyboard}:all']
+        cli.args.builds = [f'{cli.config.compile.keyboard}:all']
         cli.args.filter = []
         cli.config.mass_compile.keymap = None
         cli.config.mass_compile.parallel = cli.config.compile.parallel
-        cli.config.mass_compile.no_temp = False
+        cli.args.no_temp = False
         return mass_compile(cli)
 
     # Build the environment vars
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 71bb6e9454c..ffc9d57d682 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -58,8 +58,13 @@ def _get_key_left_position(key):
 def _find_invalid_encoder_index(info_data):
     """Perform additional validation of encoders
     """
-    enc_count = len(info_data.get('encoder', {}).get('rotary', []))
-    enc_count += len(info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', []))
+    enc_left = info_data.get('encoder', {}).get('rotary', [])
+    enc_right = []
+
+    if info_data.get('split', {}).get('enabled', False):
+        enc_right = info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', enc_left)
+
+    enc_count = len(enc_left) + len(enc_right)
 
     ret = []
     layouts = info_data.get('layouts', {})
@@ -78,6 +83,25 @@ def _find_invalid_encoder_index(info_data):
     return ret
 
 
+def _validate_build_target(keyboard, info_data):
+    """Non schema checks
+    """
+    keyboard_json_path = Path('keyboards') / keyboard / 'keyboard.json'
+    config_files = find_info_json(keyboard)
+
+    # keyboard.json can only exist at the deepest part of the tree
+    keyboard_json_count = 0
+    for info_file in config_files:
+        if info_file.name == 'keyboard.json':
+            keyboard_json_count += 1
+            if info_file != keyboard_json_path:
+                _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
+
+    # Moving forward keyboard.json should be used as a build target
+    if keyboard_json_count == 0:
+        _log_warning(info_data, 'Build marker "keyboard.json" not found.')
+
+
 def _validate_layouts(keyboard, info_data):  # noqa C901
     """Non schema checks
     """
@@ -176,6 +200,7 @@ def _validate(keyboard, info_data):
         validate(info_data, 'qmk.api.keyboard.v1')
 
         # Additional validation
+        _validate_build_target(keyboard, info_data)
         _validate_layouts(keyboard, info_data)
         _validate_keycodes(keyboard, info_data)
         _validate_encoders(keyboard, info_data)
@@ -885,14 +910,6 @@ def merge_info_jsons(keyboard, info_data):
     """
     config_files = find_info_json(keyboard)
 
-    # keyboard.json can only exist at the deepest part of the tree
-    keyboard_json_count = 0
-    for index, info_file in enumerate(config_files):
-        if Path(info_file).name == 'keyboard.json':
-            keyboard_json_count += 1
-            if index != 0 or keyboard_json_count > 1:
-                _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
-
     for info_file in config_files:
         # Load and validate the JSON data
         new_info_data = json_load(info_file)
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index b13eed39be8..169707966ff 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -258,8 +258,8 @@ endif
 
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
--include $(CHIBIOS)/os/hal/osal/rt/osal.mk         # ChibiOS <= 19.x
--include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk     # ChibiOS >= 20.x
+include $(CHIBIOS)/os/oslib/oslib.mk
+include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 # Other files (optional).
@@ -270,6 +270,7 @@ PLATFORM_SRC = \
         $(KERNSRC) \
         $(PORTSRC) \
         $(OSALSRC) \
+        $(OSLIBSRC) \
         $(HALSRC) \
         $(PLATFORMSRC) \
         $(BOARDSRC) \
@@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM)
 
 PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC))
 
-EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
+EXTRAINCDIRS += $(CHIBIOS)/os/license \
          $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \
          $(TOP_DIR)/platforms/chibios/boards/common/configs \
          $(HALCONFDIR) $(CHCONFDIR) \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 5aaa4b452f2..df1dc1c3ee0 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -500,10 +500,10 @@ void keyboard_init(void) {
  */
 void switch_events(uint8_t row, uint8_t col, bool pressed) {
 #if defined(LED_MATRIX_ENABLE)
-    process_led_matrix(row, col, pressed);
+    led_matrix_handle_key_event(row, col, pressed);
 #endif
 #if defined(RGB_MATRIX_ENABLE)
-    process_rgb_matrix(row, col, pressed);
+    rgb_matrix_handle_key_event(row, col, pressed);
 #endif
 }
 
diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 69d62b57311..da1012cf12b 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -627,6 +627,15 @@ enum qk_keycode_defines {
     QK_BACKLIGHT_UP = 0x7804,
     QK_BACKLIGHT_STEP = 0x7805,
     QK_BACKLIGHT_TOGGLE_BREATHING = 0x7806,
+    QK_LED_MATRIX_ON = 0x7810,
+    QK_LED_MATRIX_OFF = 0x7811,
+    QK_LED_MATRIX_TOGGLE = 0x7812,
+    QK_LED_MATRIX_MODE_NEXT = 0x7813,
+    QK_LED_MATRIX_MODE_PREVIOUS = 0x7814,
+    QK_LED_MATRIX_BRIGHTNESS_UP = 0x7815,
+    QK_LED_MATRIX_BRIGHTNESS_DOWN = 0x7816,
+    QK_LED_MATRIX_SPEED_UP = 0x7817,
+    QK_LED_MATRIX_SPEED_DOWN = 0x7818,
     RGB_TOG = 0x7820,
     RGB_MODE_FORWARD = 0x7821,
     RGB_MODE_REVERSE = 0x7822,
@@ -1281,6 +1290,15 @@ enum qk_keycode_defines {
     BL_UP      = QK_BACKLIGHT_UP,
     BL_STEP    = QK_BACKLIGHT_STEP,
     BL_BRTG    = QK_BACKLIGHT_TOGGLE_BREATHING,
+    LM_ON      = QK_LED_MATRIX_ON,
+    LM_OFF     = QK_LED_MATRIX_OFF,
+    LM_TOGG    = QK_LED_MATRIX_TOGGLE,
+    LM_NEXT    = QK_LED_MATRIX_MODE_NEXT,
+    LM_PREV    = QK_LED_MATRIX_MODE_PREVIOUS,
+    LM_BRIU    = QK_LED_MATRIX_BRIGHTNESS_UP,
+    LM_BRID    = QK_LED_MATRIX_BRIGHTNESS_DOWN,
+    LM_SPDU    = QK_LED_MATRIX_SPEED_UP,
+    LM_SPDD    = QK_LED_MATRIX_SPEED_DOWN,
     RGB_MOD    = RGB_MODE_FORWARD,
     RGB_RMOD   = RGB_MODE_REVERSE,
     RGB_M_P    = RGB_MODE_PLAIN,
@@ -1416,6 +1434,7 @@ enum qk_keycode_defines {
 #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
 #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING)
+#define IS_LED_MATRIX_KEYCODE(code) ((code) >= QK_LED_MATRIX_ON && (code) <= QK_LED_MATRIX_SPEED_DOWN)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_ALT_REPEAT_KEY)
 #define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31)
@@ -1438,6 +1457,7 @@ enum qk_keycode_defines {
 #define STENO_KEYCODE_RANGE                 QK_STENO_BOLT ... QK_STENO_COMB_MAX
 #define MACRO_KEYCODE_RANGE                 QK_MACRO_0 ... QK_MACRO_31
 #define BACKLIGHT_KEYCODE_RANGE             QK_BACKLIGHT_ON ... QK_BACKLIGHT_TOGGLE_BREATHING
+#define LED_MATRIX_KEYCODE_RANGE            QK_LED_MATRIX_ON ... QK_LED_MATRIX_SPEED_DOWN
 #define RGB_KEYCODE_RANGE                   RGB_TOG ... RGB_MODE_TWINKLE
 #define QUANTUM_KEYCODE_RANGE               QK_BOOTLOADER ... QK_ALT_REPEAT_KEY
 #define KB_KEYCODE_RANGE                    QK_KB_0 ... QK_KB_31
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index c0fb4c810b1..2ca62c6969d 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -159,7 +159,7 @@ void led_matrix_set_value_all(uint8_t value) {
 #endif
 }
 
-void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
+void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) {
 #ifndef LED_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index 941d42aecad..9a13c3e52b4 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -124,7 +124,7 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
 void led_matrix_set_value(int index, uint8_t value);
 void led_matrix_set_value_all(uint8_t value);
 
-void process_led_matrix(uint8_t row, uint8_t col, bool pressed);
+void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed);
 
 void led_matrix_task(void);
 
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index bcced166c0d..4682aceb14d 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -368,7 +368,7 @@ void pointing_device_set_cpi(uint16_t cpi) {
  * @param[in] cpi uint16_t value.
  */
 void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {
-    bool local = (is_keyboard_left() & left) ? true : false;
+    bool local = (is_keyboard_left() == left);
     if (local) {
         pointing_device_driver.set_cpi(cpi);
     } else {
diff --git a/quantum/process_keycode/process_backlight.c b/quantum/process_keycode/process_backlight.c
index c1596ec07d1..dafe9797607 100644
--- a/quantum/process_keycode/process_backlight.c
+++ b/quantum/process_keycode/process_backlight.c
@@ -15,36 +15,11 @@
  */
 
 #include "process_backlight.h"
-
-#ifdef LED_MATRIX_ENABLE
-#    include "led_matrix.h"
-#else
-#    include "backlight.h"
-#endif
+#include "backlight.h"
 
 bool process_backlight(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
-#ifdef LED_MATRIX_ENABLE
-            case QK_BACKLIGHT_ON:
-                led_matrix_enable();
-                return false;
-            case QK_BACKLIGHT_OFF:
-                led_matrix_disable();
-                return false;
-            case QK_BACKLIGHT_DOWN:
-                led_matrix_decrease_val();
-                return false;
-            case QK_BACKLIGHT_UP:
-                led_matrix_increase_val();
-                return false;
-            case QK_BACKLIGHT_TOGGLE:
-                led_matrix_toggle();
-                return false;
-            case QK_BACKLIGHT_STEP:
-                led_matrix_step();
-                return false;
-#else
             case QK_BACKLIGHT_ON:
                 backlight_level(BACKLIGHT_LEVELS);
                 return false;
@@ -63,11 +38,10 @@ bool process_backlight(uint16_t keycode, keyrecord_t *record) {
             case QK_BACKLIGHT_STEP:
                 backlight_step();
                 return false;
-#    ifdef BACKLIGHT_BREATHING
+#ifdef BACKLIGHT_BREATHING
             case QK_BACKLIGHT_TOGGLE_BREATHING:
                 backlight_toggle_breathing();
                 return false;
-#    endif
 #endif
         }
     }
diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c
new file mode 100644
index 00000000000..7f95bf10115
--- /dev/null
+++ b/quantum/process_keycode/process_led_matrix.c
@@ -0,0 +1,47 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "process_led_matrix.h"
+#include "led_matrix.h"
+
+bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case QK_BACKLIGHT_ON: // TODO: Remove backlight keycodes
+            case QK_LED_MATRIX_ON:
+                led_matrix_enable();
+                return false;
+            case QK_BACKLIGHT_OFF:
+            case QK_LED_MATRIX_OFF:
+                led_matrix_disable();
+                return false;
+            case QK_BACKLIGHT_TOGGLE:
+            case QK_LED_MATRIX_TOGGLE:
+                led_matrix_toggle();
+                return false;
+            case QK_BACKLIGHT_STEP:
+            case QK_LED_MATRIX_MODE_NEXT:
+                led_matrix_step();
+                return false;
+            case QK_LED_MATRIX_MODE_PREVIOUS:
+                led_matrix_step_reverse();
+                return false;
+            case QK_BACKLIGHT_UP:
+            case QK_LED_MATRIX_BRIGHTNESS_UP:
+                led_matrix_increase_val();
+                return false;
+            case QK_BACKLIGHT_DOWN:
+            case QK_LED_MATRIX_BRIGHTNESS_DOWN:
+                led_matrix_decrease_val();
+                return false;
+            case QK_LED_MATRIX_SPEED_UP:
+                led_matrix_increase_speed();
+                return false;
+            case QK_LED_MATRIX_SPEED_DOWN:
+                led_matrix_decrease_speed();
+                return false;
+        }
+    }
+
+    return true;
+}
diff --git a/quantum/process_keycode/process_led_matrix.h b/quantum/process_keycode/process_led_matrix.h
new file mode 100644
index 00000000000..407d04aa27e
--- /dev/null
+++ b/quantum/process_keycode/process_led_matrix.h
@@ -0,0 +1,10 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
+bool process_led_matrix(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 6639dc22910..011f9d73e4a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 
-#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
+#ifdef BACKLIGHT_ENABLE
 #    include "process_backlight.h"
 #endif
 
@@ -40,6 +40,10 @@
 #    include "process_leader.h"
 #endif
 
+#ifdef LED_MATRIX_ENABLE
+#    include "process_led_matrix.h"
+#endif
+
 #ifdef MAGIC_ENABLE
 #    include "process_magic.h"
 #endif
@@ -333,9 +337,12 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifdef AUDIO_ENABLE
             process_audio(keycode, record) &&
 #endif
-#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
+#if defined(BACKLIGHT_ENABLE)
             process_backlight(keycode, record) &&
 #endif
+#if defined(LED_MATRIX_ENABLE)
+            process_led_matrix(keycode, record) &&
+#endif
 #ifdef STENO_ENABLE
             process_steno(keycode, record) &&
 #endif
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 260ac1c8a44..51ec77bae0f 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -3,56 +3,3 @@
 // clang-format off
 
 // Deprecated Quantum keycodes
-#define SH_TG QK_SWAP_HANDS_TOGGLE
-#define SQ_TOG QK_SEQUENCER_TOGGLE
-
-#define MAGIC_SWAP_CONTROL_CAPSLOCK      QK_MAGIC_SWAP_CONTROL_CAPS_LOCK
-#define MAGIC_UNSWAP_CONTROL_CAPSLOCK    QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK
-#define MAGIC_TOGGLE_CONTROL_CAPSLOCK    QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK
-#define MAGIC_UNCAPSLOCK_TO_CONTROL      QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF
-#define MAGIC_CAPSLOCK_TO_CONTROL        QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON
-#define MAGIC_SWAP_LALT_LGUI             QK_MAGIC_SWAP_LALT_LGUI
-#define MAGIC_UNSWAP_LALT_LGUI           QK_MAGIC_UNSWAP_LALT_LGUI
-#define MAGIC_SWAP_RALT_RGUI             QK_MAGIC_SWAP_RALT_RGUI
-#define MAGIC_UNSWAP_RALT_RGUI           QK_MAGIC_UNSWAP_RALT_RGUI
-#define MAGIC_UNNO_GUI                   QK_MAGIC_GUI_ON
-#define MAGIC_NO_GUI                     QK_MAGIC_GUI_OFF
-#define MAGIC_TOGGLE_GUI                 QK_MAGIC_TOGGLE_GUI
-#define MAGIC_SWAP_GRAVE_ESC             QK_MAGIC_SWAP_GRAVE_ESC
-#define MAGIC_UNSWAP_GRAVE_ESC           QK_MAGIC_UNSWAP_GRAVE_ESC
-#define MAGIC_SWAP_BACKSLASH_BACKSPACE   QK_MAGIC_SWAP_BACKSLASH_BACKSPACE
-#define MAGIC_UNSWAP_BACKSLASH_BACKSPACE QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE
-#define MAGIC_TOGGLE_BACKSLASH_BACKSPACE QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE
-#define MAGIC_HOST_NKRO                  QK_MAGIC_NKRO_ON
-#define MAGIC_UNHOST_NKRO                QK_MAGIC_NKRO_OFF
-#define MAGIC_TOGGLE_NKRO                QK_MAGIC_TOGGLE_NKRO
-#define MAGIC_SWAP_ALT_GUI               QK_MAGIC_SWAP_ALT_GUI
-#define MAGIC_UNSWAP_ALT_GUI             QK_MAGIC_UNSWAP_ALT_GUI
-#define MAGIC_TOGGLE_ALT_GUI             QK_MAGIC_TOGGLE_ALT_GUI
-#define MAGIC_SWAP_LCTL_LGUI             QK_MAGIC_SWAP_LCTL_LGUI
-#define MAGIC_UNSWAP_LCTL_LGUI           QK_MAGIC_UNSWAP_LCTL_LGUI
-#define MAGIC_SWAP_RCTL_RGUI             QK_MAGIC_SWAP_RCTL_RGUI
-#define MAGIC_UNSWAP_RCTL_RGUI           QK_MAGIC_UNSWAP_RCTL_RGUI
-#define MAGIC_SWAP_CTL_GUI               QK_MAGIC_SWAP_CTL_GUI
-#define MAGIC_UNSWAP_CTL_GUI             QK_MAGIC_UNSWAP_CTL_GUI
-#define MAGIC_TOGGLE_CTL_GUI             QK_MAGIC_TOGGLE_CTL_GUI
-#define MAGIC_EE_HANDS_LEFT              QK_MAGIC_EE_HANDS_LEFT
-#define MAGIC_EE_HANDS_RIGHT             QK_MAGIC_EE_HANDS_RIGHT
-#define MAGIC_SWAP_ESCAPE_CAPSLOCK       QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK
-#define MAGIC_UNSWAP_ESCAPE_CAPSLOCK     QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK
-#define MAGIC_TOGGLE_ESCAPE_CAPSLOCK     QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK
-
-#define LCG_SWP QK_MAGIC_SWAP_LCTL_LGUI
-#define LCG_NRM QK_MAGIC_UNSWAP_LCTL_LGUI
-#define RCG_SWP QK_MAGIC_SWAP_RCTL_RGUI
-#define RCG_NRM QK_MAGIC_UNSWAP_RCTL_RGUI
-#define LAG_SWP QK_MAGIC_SWAP_LALT_LGUI
-#define LAG_NRM QK_MAGIC_UNSWAP_LALT_LGUI
-#define RAG_SWP QK_MAGIC_SWAP_RALT_RGUI
-#define RAG_NRM QK_MAGIC_UNSWAP_RALT_RGUI
-#define GUI_ON  QK_MAGIC_GUI_ON
-#define GUI_OFF QK_MAGIC_GUI_OFF
-#define GUI_TOG QK_MAGIC_TOGGLE_GUI
-
-#define X(i) UM(i)
-#define XP(i, j) UP(i, j)
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 655aca18679..aaba00b4576 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -156,7 +156,7 @@ void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 #endif
 }
 
-void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
+void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) {
 #ifndef RGB_MATRIX_SPLIT
     if (!is_keyboard_master()) return;
 #endif
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index f8a6845e02b..ceb3185d1a8 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -148,7 +148,7 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
 void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 
-void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed);
+void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed);
 
 void rgb_matrix_task(void);
 
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 33bc9e9f575..decf5e5ede0 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -419,6 +419,10 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav
     if (!mods_need_sync && new_mods.oneshot_mods != split_shmem->mods.oneshot_mods) {
         mods_need_sync = true;
     }
+    new_mods.oneshot_locked_mods = get_oneshot_locked_mods();
+    if (!mods_need_sync && new_mods.oneshot_locked_mods != split_shmem->mods.oneshot_locked_mods) {
+        mods_need_sync = true;
+    }
 #    endif // NO_ACTION_ONESHOT
 
     bool okay = true;
@@ -442,6 +446,7 @@ static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
     set_weak_mods(mods.weak_mods);
 #    ifndef NO_ACTION_ONESHOT
     set_oneshot_mods(mods.oneshot_mods);
+    set_oneshot_locked_mods(mods.oneshot_locked_mods);
 #    endif
 }
 
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 4f6b968fa8a..fbd87ca3123 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -101,6 +101,7 @@ typedef struct _split_mods_sync_t {
     uint8_t weak_mods;
 #    ifndef NO_ACTION_ONESHOT
     uint8_t oneshot_mods;
+    uint8_t oneshot_locked_mods;
 #    endif // NO_ACTION_ONESHOT
 } split_mods_sync_t;
 #endif // SPLIT_MODS_ENABLE
diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
index 29f7c710a03..06064e77f91 100644
--- a/tests/test_common/keycode_table.cpp
+++ b/tests/test_common/keycode_table.cpp
@@ -569,6 +569,15 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = {
     {QK_BACKLIGHT_UP, "QK_BACKLIGHT_UP"},
     {QK_BACKLIGHT_STEP, "QK_BACKLIGHT_STEP"},
     {QK_BACKLIGHT_TOGGLE_BREATHING, "QK_BACKLIGHT_TOGGLE_BREATHING"},
+    {QK_LED_MATRIX_ON, "QK_LED_MATRIX_ON"},
+    {QK_LED_MATRIX_OFF, "QK_LED_MATRIX_OFF"},
+    {QK_LED_MATRIX_TOGGLE, "QK_LED_MATRIX_TOGGLE"},
+    {QK_LED_MATRIX_MODE_NEXT, "QK_LED_MATRIX_MODE_NEXT"},
+    {QK_LED_MATRIX_MODE_PREVIOUS, "QK_LED_MATRIX_MODE_PREVIOUS"},
+    {QK_LED_MATRIX_BRIGHTNESS_UP, "QK_LED_MATRIX_BRIGHTNESS_UP"},
+    {QK_LED_MATRIX_BRIGHTNESS_DOWN, "QK_LED_MATRIX_BRIGHTNESS_DOWN"},
+    {QK_LED_MATRIX_SPEED_UP, "QK_LED_MATRIX_SPEED_UP"},
+    {QK_LED_MATRIX_SPEED_DOWN, "QK_LED_MATRIX_SPEED_DOWN"},
     {RGB_TOG, "RGB_TOG"},
     {RGB_MODE_FORWARD, "RGB_MODE_FORWARD"},
     {RGB_MODE_REVERSE, "RGB_MODE_REVERSE"},